Skip to content

UX: show rectangle 'TopLeft' prop in toolbar #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rodlie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

UX: show rectangle 'TopLeft' prop in toolbar #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 39 additions & 5 deletions src/ui/widgets/toolcontrols.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ ToolControls::ToolControls(QWidget *parent)
, mTransformSY(nullptr)
, mTransformRX(nullptr)
, mTransformRY(nullptr)
, mTransformTX(nullptr)
, mTransformTY(nullptr)
, mTransformBX(nullptr)
, mTransformBY(nullptr)
, mTransformPX(nullptr)
Expand All @@ -48,6 +50,8 @@ ToolControls::ToolControls(QWidget *parent)
, mTransformRotate(nullptr)
, mTransformScale(nullptr)
, mTransformRadius(nullptr)
, mTransformRectangle(nullptr)
, mTransformTopLeft(nullptr)
, mTransformBottomRight(nullptr)
, mTransformPivot(nullptr)
, mTransformOpacity(nullptr)
Expand Down Expand Up @@ -88,7 +92,10 @@ void ToolControls::setCanvasMode(const CanvasMode &mode)
const bool isBoxOrPointMode = isBoxMode || mode == CanvasMode::pointTransform;

const bool hasRadius = mTransformRX->hasTarget() && mTransformRY->hasTarget();
const bool hasRectangle = mTransformBX->hasTarget() && mTransformBY->hasTarget();

const bool hasRectangleTop = mTransformTX->hasTarget() && mTransformTY->hasTarget();
const bool hasRectangleBottom = mTransformBX->hasTarget() && mTransformBY->hasTarget();
const bool hasRectangle = hasRectangleTop || hasRectangleBottom;

const bool showRectangle = isBoxOrPointMode || mode == CanvasMode::rectCreate;

Expand All @@ -102,7 +109,9 @@ void ToolControls::setCanvasMode(const CanvasMode &mode)
mTransformPivot->setVisible(hasPivot && isBoxMode);
mTransformOpacity->setVisible(hasOpacity && isBoxMode);
mTransformRadius->setVisible(hasRadius && showRadius);
mTransformBottomRight->setVisible(hasRectangle && showRectangle);
mTransformRectangle->setVisible(hasRectangle && showRectangle);
mTransformTopLeft->setVisible(hasRectangleTop && showRectangle && !isBoxMode);
mTransformBottomRight->setVisible(hasRectangleBottom && showRectangle);
}

void ToolControls::setTransform(BoundingBox * const target)
Expand Down Expand Up @@ -159,11 +168,16 @@ void ToolControls::setTransform(BoundingBox * const target)
circle->getVRadiusAnimator()->getYAnimator() :
(rectangle ? rectangle->getRadiusAnimator()->getYAnimator() : nullptr));

mTransformTX->setTarget(rectangle ? rectangle->getTopLeftAnimator()->getXAnimator() : nullptr);
mTransformTY->setTarget(rectangle ? rectangle->getTopLeftAnimator()->getYAnimator() : nullptr);
mTransformBX->setTarget(rectangle ? rectangle->getBottomRightAnimator()->getXAnimator() : nullptr);
mTransformBY->setTarget(rectangle ? rectangle->getBottomRightAnimator()->getYAnimator() : nullptr);

const bool hasRadius = (circle || rectangle);
mTransformRadius->setEnabled(hasRadius);

mTransformRectangle->setEnabled(rectangle);
mTransformTopLeft->setEnabled(rectangle);
mTransformBottomRight->setEnabled(rectangle);

setCanvasMode(mCanvasMode);
Expand All @@ -178,6 +192,8 @@ void ToolControls::resetWidgets()
mTransformSY->setTarget(nullptr);
mTransformRX->setTarget(nullptr);
mTransformRY->setTarget(nullptr);
mTransformTX->setTarget(nullptr);
mTransformTY->setTarget(nullptr);
mTransformBX->setTarget(nullptr);
mTransformBY->setTarget(nullptr);
mTransformPX->setTarget(nullptr);
Expand All @@ -188,11 +204,15 @@ void ToolControls::resetWidgets()
mTransformRotate->setEnabled(false);
mTransformScale->setEnabled(false);
mTransformRadius->setEnabled(false);
mTransformRectangle->setEnabled(false);
mTransformTopLeft->setEnabled(false);
mTransformBottomRight->setEnabled(false);
mTransformPivot->setEnabled(false);
mTransformOpacity->setEnabled(false);

mTransformRadius->setVisible(false);
mTransformRectangle->setVisible(false);
mTransformTopLeft->setVisible(false);
mTransformBottomRight->setVisible(false);
mTransformPivot->setVisible(false);
mTransformOpacity->setVisible(false);
Expand All @@ -204,6 +224,8 @@ void ToolControls::setupWidgets()
mTransformRotate = new QActionGroup(this);
mTransformScale = new QActionGroup(this);
mTransformRadius = new QActionGroup(this);
mTransformRectangle = new QActionGroup(this);
mTransformTopLeft = new QActionGroup(this);
mTransformBottomRight = new QActionGroup(this);
mTransformPivot = new QActionGroup(this);
mTransformOpacity = new QActionGroup(this);
Expand All @@ -220,6 +242,8 @@ void ToolControls::setupTransform()
mTransformSY = new QrealAnimatorValueSlider(nullptr, this);
mTransformRX = new QrealAnimatorValueSlider(nullptr, this);
mTransformRY = new QrealAnimatorValueSlider(nullptr, this);
mTransformTX = new QrealAnimatorValueSlider(nullptr, this);
mTransformTY = new QrealAnimatorValueSlider(nullptr, this);
mTransformBX = new QrealAnimatorValueSlider(nullptr, this);
mTransformBY = new QrealAnimatorValueSlider(nullptr, this);
mTransformPX = new QrealAnimatorValueSlider(nullptr, this);
Expand Down Expand Up @@ -257,13 +281,19 @@ void ToolControls::setupTransform()
tr("Opacity")));
mTransformOpacity->addAction(addWidget(mTransformOX));

mTransformBottomRight->addAction(addSpacer(true, true));
mTransformBottomRight->addAction(addAction(QIcon::fromTheme("rectCreate"),
tr("Rectangle")));
mTransformRectangle->addAction(addSpacer(true, true));
mTransformRectangle->addAction(addAction(QIcon::fromTheme("rectCreate"),
tr("Rectangle")));

mTransformBottomRight->addAction(addWidget(mTransformBX));
mTransformBottomRight->addAction(addSeparator());
mTransformBottomRight->addAction(addWidget(mTransformBY));

mTransformTopLeft->addAction(addSeparator());
mTransformTopLeft->addAction(addWidget(mTransformTX));
mTransformTopLeft->addAction(addSeparator());
mTransformTopLeft->addAction(addWidget(mTransformTY));

mTransformRadius->addAction(addSpacer(true, true));
mTransformRadius->addAction(addAction(QIcon::fromTheme("transform_radius"),
tr("Radius")));
Expand All @@ -287,6 +317,10 @@ void ToolControls::setupTransform()
mTransformRX->setDisplayedValue(0);
mTransformRY->setValueRange(0, 1);
mTransformRY->setDisplayedValue(0);
mTransformTX->setValueRange(0, 1);
mTransformTX->setDisplayedValue(0);
mTransformTY->setValueRange(0, 1);
mTransformTY->setDisplayedValue(0);
mTransformBX->setValueRange(0, 1);
mTransformBX->setDisplayedValue(0);
mTransformBY->setValueRange(0, 1);
Expand Down
4 changes: 4 additions & 0 deletions src/ui/widgets/toolcontrols.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ namespace Friction
QrealAnimatorValueSlider *mTransformSY;
QrealAnimatorValueSlider *mTransformRX;
QrealAnimatorValueSlider *mTransformRY;
QrealAnimatorValueSlider *mTransformTX;
QrealAnimatorValueSlider *mTransformTY;
QrealAnimatorValueSlider *mTransformBX;
QrealAnimatorValueSlider *mTransformBY;
QrealAnimatorValueSlider *mTransformPX;
Expand All @@ -72,6 +74,8 @@ namespace Friction
QActionGroup *mTransformRotate;
QActionGroup *mTransformScale;
QActionGroup *mTransformRadius;
QActionGroup *mTransformRectangle;
QActionGroup *mTransformTopLeft;
QActionGroup *mTransformBottomRight;
QActionGroup *mTransformPivot;
QActionGroup *mTransformOpacity;
Expand Down