jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-07 10:33:24 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Client] Replace playmat crop spinboxes with a direct manipulation preview (#7161)

Browse source 
* [Client] Replace playmat crop spinboxes with a direct manipulation preview

The numeric fields exposed raw parameters with no relation to what the
game draws, accepted values the renderer clamps away, and no way to see
the result before committing

The preview now renders through the exact game pipeline into a viewport
shaped like a fresh board stack plus table area, with dimmed strips
marking where a developed table crops further. Drag pans, wheel zooms,
arrow keys nudge, plus and minus zoom, Backspace or Esc restores the
crop as of focus gain and lets Esc close the dialog when unchanged.
Focus ring and accessible name and description cover keyboard and screen
reader users, new paints use palette roles so themes recolor them

Took 25 minutes

Took 3 minutes


Took 54 seconds

* Remove stale constant

Took 3 minutes


Took 26 seconds

* Rebase

Took 2 minutes


Took 3 seconds

* Add editor spinboxes again

Took 4 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-08-24 18:22:48 +02:00 • committed by GitHub
parent 0b0ec64fe7
commit fecbbab983
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 398 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
View file

@ -1,16 +1,23 @@
#ifndef COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
#define COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
#include <QFocusEvent>
#include <QPixmap>
#include <QWidget>
#include <libcockatrice/deck_list/deck_list.h>
/**
* @brief Preview widget that shows how a playmat card art will appear
* @brief Interactive crop surface showing how a playmat card art will appear
* across the combined table + stack play area.
*
* Renders a miniature mockup with the card art applied using the
* given PlaymatParams, including faint zone divider lines.
* Renders a fixed frame shaped like a fresh board's stack+table area (the
* most generous framing the game produces): it shows the tallest slice of
* the square crop in normal play, with dimmed strips marking where a wider,
* developed table crops further, exactly the game's own render pipeline.
* The widget doubles as the editor's primary crop control: dragging pans the
* art behind the frame, the wheel zooms, and arrow keys nudge, mirroring
* the stored parameters (margins pan horizontally, verticalOffset
* vertically, zoom scales) so no separate numeric controls are needed.
*/
class PlaymatPreviewWidget : public QWidget
{
@ -23,13 +30,32 @@ public:
void setParams(const PlaymatParams &params);
void setAttribution(const QString &attribution);
signals:
/** @brief Emitted whenever direct manipulation (drag, wheel, keys) changes the crop parameters. */
void paramsEdited(const PlaymatParams &params);
protected:
void paintEvent(QPaintEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void wheelEvent(QWheelEvent *event) override;
void keyPressEvent(QKeyEvent *event) override;
void focusInEvent(QFocusEvent *event) override;
private:
QRectF activePlayArea() const; ///< destination rect used for rendering AND gesture math
qreal samplingWindowSide() const; ///< clamped square window side, shared with the render path
qreal widgetToSourceScale() const;
void applyCropDelta(qreal dMarginL, qreal dMarginR, qreal dOffset, qreal zoomFactor);
bool sameCrop(const PlaymatParams &a, const PlaymatParams &b) const;
void restoreSnapshot();
QPixmap sourcePixmap;
PlaymatParams params;
PlaymatParams paramsAtFocusIn; ///< crop as of the latest focus gain, restored by Esc or Backspace
QString attributionText;
QPoint lastDragPos; ///< widget space position of the previous mouse move while panning
};
#endif // COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H