diff --git a/lib/redeyereduction/redeyereductiontool.cpp b/lib/redeyereduction/redeyereductiontool.cpp index 557df77b..f8455b60 100644 --- a/lib/redeyereduction/redeyereductiontool.cpp +++ b/lib/redeyereduction/redeyereductiontool.cpp @@ -63,12 +63,16 @@ struct RedEyeReductionWidget : public QWidget, public Ui_RedEyeReductionWidget { stackedWidget->setCurrentWidget(mainPage); } + + bool adjusting() const + { + return stackedWidget->currentWidget() == mainPage; + } }; struct RedEyeReductionToolPrivate { RedEyeReductionTool* q; - RedEyeReductionTool::Status mStatus; QPointF mCenter; int mDiameter; RedEyeReductionWidget* mToolWidget; @@ -89,7 +93,7 @@ struct RedEyeReductionToolPrivate QRectF rectF() const { - if (mStatus == RedEyeReductionTool::NotSet) { + if (!mToolWidget->adjusting()) { return QRectF(); } return QRectF(mCenter.x() - mDiameter / 2, mCenter.y() - mDiameter / 2, mDiameter, mDiameter); @@ -102,7 +106,6 @@ RedEyeReductionTool::RedEyeReductionTool(RasterImageView* view) { d->q = this; d->mDiameter = GwenviewConfig::redEyeReductionDiameter(); - d->mStatus = NotSet; d->setupToolWidget(); view->document()->startLoadingFullImage(); @@ -117,7 +120,7 @@ RedEyeReductionTool::~RedEyeReductionTool() void RedEyeReductionTool::paint(QPainter* painter) { - if (d->mStatus == NotSet) { + if (!d->mToolWidget->adjusting()) { return; } QRectF docRectF = d->rectF(); @@ -145,10 +148,9 @@ void RedEyeReductionTool::mousePressEvent(QGraphicsSceneMouseEvent* event) return; } event->accept(); - if (d->mStatus == NotSet) { + if (!d->mToolWidget->adjusting()) { d->mToolWidget->diameterSpinBox->setValue(d->mDiameter); d->mToolWidget->showMainPage(); - d->mStatus = Adjusting; } d->mCenter = imageView()->mapToImage(event->pos()); imageView()->update(); @@ -183,7 +185,7 @@ void RedEyeReductionTool::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) void RedEyeReductionTool::keyPressEvent(QKeyEvent* event) { QDialogButtonBox *buttons; - if (d->mStatus == Adjusting) { + if (d->mToolWidget->adjusting()) { buttons = d->mToolWidget->mainDialogButtonBox; } else { buttons = d->mToolWidget->helpDialogButtonBox; @@ -225,7 +227,6 @@ void RedEyeReductionTool::slotApplyClicked() RedEyeReductionImageOperation* op = new RedEyeReductionImageOperation(docRectF); emit imageOperationRequested(op); - d->mStatus = NotSet; d->mToolWidget->showNotSetPage(); } diff --git a/lib/redeyereduction/redeyereductiontool.h b/lib/redeyereduction/redeyereductiontool.h index 3dfe8850..d7a5b9cf 100644 --- a/lib/redeyereduction/redeyereductiontool.h +++ b/lib/redeyereduction/redeyereductiontool.h @@ -41,11 +41,6 @@ class GWENVIEWLIB_EXPORT RedEyeReductionTool : public AbstractRasterImageViewToo { Q_OBJECT public: - enum Status { - NotSet, - Adjusting - }; - explicit RedEyeReductionTool(RasterImageView* parent); ~RedEyeReductionTool() override;