Refactored Color Pick Mode

src/app/GUI/mainwindow.cpp

@@ -154,6 +154,7 @@ MainWindow::MainWindow(Document& document,
     , mViewFillStrokeAct(nullptr)
     , mRenderWindow(nullptr)
     , mRenderWindowAct(nullptr)
+    , mColorPickLabel(nullptr)
 {
     Q_ASSERT(!sInstance);
     sInstance = this;
@@ -188,6 +189,8 @@ MainWindow::MainWindow(Document& document,
             this, &MainWindow::openApplyExpressionDialog);
     connect(&mDocument, &Document::newVideo,
             this, &MainWindow::handleNewVideoClip);
+    connect(&mDocument, &Document::currentPixelColor,
+            this, &MainWindow::handleCurrentPixelColor);
 
     setWindowIcon(QIcon::fromTheme(AppSupport::getAppName()));
 
@@ -327,6 +330,10 @@ MainWindow::MainWindow(Document& document,
 
     statusBar()->addPermanentWidget(mCanvasToolBar);
 
+    mColorPickLabel = new QLabel(this);
+    mColorPickLabel->setVisible(false);
+    statusBar()->addWidget(mColorPickLabel);
+
     // final layout
     mUI = new UILayout(this);
     std::vector<UILayout::Item> docks;
@@ -1349,6 +1356,11 @@ void MainWindow::updateCanvasModeButtonsChecked()
     mToolBoxDraw->setEnabled(drawMode);
     mToolBoxDraw->setVisible(drawMode);
     mLocalPivotAct->setEnabled(pointMode || boxMode);
+
+    if (mColorPickLabel) {
+        mColorPickLabel->clear();
+        mColorPickLabel->setVisible(mode == CanvasMode::pickFillStroke);
+    }
 }
 
 void MainWindow::setResolutionValue(const qreal value)
@@ -2090,4 +2102,18 @@ void MainWindow::handleNewVideoClip(const VideoBox::VideoSpecs &specs)
     // open dialog if ask
     AdjustSceneDialog dialog(scene, specs, this);
     dialog.exec();
- }
+}
+
+void MainWindow::handleCurrentPixelColor(const QColor &color)
+{
+    if (!color.isValid()) {
+        mColorPickLabel->clear();
+        return;
+    }
+    mColorPickLabel->setText(QString("&nbsp;&nbsp;<span style=\"background-color: %4;\">"
+                                     "&nbsp;&nbsp;&nbsp;&nbsp;</span>&nbsp;&nbsp;"
+                                     "<b>RGB</b> %1, %2, %3").arg(QString::number(color.redF()),
+                                                                  QString::number(color.greenF()),
+                                                                  QString::number(color.blueF()),
+                                                                  color.name()));
+}

src/app/GUI/mainwindow.h

@@ -215,6 +215,8 @@ class MainWindow : public QMainWindow
 
     void handleNewVideoClip(const VideoBox::VideoSpecs &specs);
 
+    void handleCurrentPixelColor(const QColor &color);
+
     TimelineDockWidget *mTimeline;
     RenderWidget *mRenderWidget;
 
@@ -380,6 +382,8 @@ class MainWindow : public QMainWindow
     void initRenderPresets(const bool reinstall = false);
     void askInstallRenderPresets();
 
+    QLabel *mColorPickLabel;
+
 protected:
     void keyPressEvent(QKeyEvent *event);
     bool eventFilter(QObject *obj, QEvent *e);

src/app/GUI/toolbox.cpp

@@ -248,8 +248,8 @@ void MainWindow::setupToolBoxMain()
     mToolBoxGroupMain->addAction(nullModeAct);
 
     // pickMode
-    /*QAction *pickModeAct = new QAction(QIcon::fromTheme("pick"),
-                                       tr("Pick Mode"),
+    QAction *pickModeAct = new QAction(QIcon::fromTheme("pick"),
+                                       tr("Color Pick Mode"),
                                        this);
     pickModeAct->setCheckable(true);
     pickModeAct->setShortcut(QKeySequence(AppSupport::getSettings("shortcuts",
@@ -269,7 +269,8 @@ void MainWindow::setupToolBoxMain()
                     pickModeAct->setChecked(true);
                 }
             });
-    mToolBoxGroupMain->addAction(pickModeAct);*/
+
+    mToolBoxGroupMain->addAction(pickModeAct);
 
     mToolBoxMain->addActions(mToolBoxGroupMain->actions());
 

src/core/Private/document.cpp

@@ -169,6 +169,10 @@ void Document::setActiveScene(Canvas * const scene) {
                         this, [this](QrealAnimator* const target) {
             emit openApplyExpressionDialog(target);
         });
+        conn << connect(fActiveScene, &Canvas::currentHoverColor,
+                        this, [this](const QColor &color) {
+            emit currentPixelColor(color);
+        });
         emit currentBoxChanged(fActiveScene->getCurrentBox());
         emit selectedPaintSettingsChanged();
     }

src/core/Private/document.h

@@ -214,6 +214,7 @@ class CORE_EXPORT Document : public SingleWidgetTarget {
     void openExpressionDialog(QrealAnimator* const target);
     void openApplyExpressionDialog(QrealAnimator* const target);
     void newVideo(const VideoBox::VideoSpecs specs);
+    void currentPixelColor(const QColor &color);
 };
 
 #endif // DOCUMENT_H

src/core/actions.cpp

@@ -828,8 +828,7 @@ void Actions::setRectangleMode() {
 }
 
 void Actions::setPickPaintSettingsMode() {
-    // mDocument.setCanvasMode(CanvasMode::pickFillStroke);
-    // Disabled, why would anyone use this?
+    mDocument.setCanvasMode(CanvasMode::pickFillStroke);
 }
 
 void Actions::setCircleMode() {

src/core/canvas.cpp

@@ -770,6 +770,10 @@ void Canvas::updatePivot()
 
 void Canvas::setCanvasMode(const CanvasMode mode)
 {
+    if (mCurrentMode == CanvasMode::pickFillStroke) {
+        emit currentPickedColor(QColor());
+        emit currentHoverColor(QColor());
+    }
     mCurrentMode = mode;
     mSelecting = false;
     mStylusDrawing = false;

src/core/canvas.h

@@ -450,6 +450,8 @@ class CORE_EXPORT Canvas : public CanvasBase
     void openMarkerEditor();
     void openExpressionDialog(QrealAnimator* const target);
     void openApplyExpressionDialog(QrealAnimator* const target);
+    void currentPickedColor(const QColor &color);
+    void currentHoverColor(const QColor &color);
 
 public:
     void makePointCtrlsSymmetric();
@@ -734,6 +736,8 @@ class CORE_EXPORT Canvas : public CanvasBase
     void drawPathClear();
     void drawPathFinish(const qreal invScale);
 
+    const QColor pickPixelColor(const QPoint &pos);
+
     qreal mLastDRot = 0;
     int mRotHalfCycles = 0;
     TransformMode mTransMode = TransformMode::none;

src/core/canvasmouseevents.cpp

@@ -70,13 +70,18 @@ void Canvas::mousePressEvent(const eMouseEvent &e) {
     }
 }
 
-void Canvas::mouseMoveEvent(const eMouseEvent &e) {
-    if(mStylusDrawing) return;
-    if(isPreviewingOrRendering()) return;
+void Canvas::mouseMoveEvent(const eMouseEvent &e)
+{
+    if (mStylusDrawing) { return; }
+    if (isPreviewingOrRendering()) { return; }
 
     const bool leftPressed = e.fButtons & Qt::LeftButton;
 
-    if(!leftPressed && !e.fMouseGrabbing) {
+    if (!leftPressed && !e.fMouseGrabbing) {
+        if (mCurrentMode == CanvasMode::pickFillStroke) {
+            emit currentHoverColor(pickPixelColor(e.fGlobalPos));
+            return;
+        }
         const auto lastHoveredBox = mHoveredBox;
         const auto lastHoveredPoint = mHoveredPoint_d;
         const auto lastNSegment = mHoveredNormalSegment;
@@ -153,17 +158,25 @@ void Canvas::mouseMoveEvent(const eMouseEvent &e) {
         e.fGrabMouse();
 }
 
-void Canvas::mouseReleaseEvent(const eMouseEvent &e) {
-    if(isPreviewingOrRendering()) return;
-    if(e.fButton == Qt::RightButton) {
-        if(mCurrentMode == CanvasMode::paint) {
-        } else if(mCurrentMode == CanvasMode::drawPath) {
+void Canvas::mouseReleaseEvent(const eMouseEvent &e)
+{
+    if (isPreviewingOrRendering()) { return; }
+    if (e.fButton == Qt::RightButton) {
+        switch(mCurrentMode) {
+        case CanvasMode::paint:
+            break;
+        case CanvasMode::drawPath:
             drawPathClear();
-        } else {
+            break;
+        case CanvasMode::pickFillStroke:
+            emit currentPickedColor(QColor());
+            emit currentHoverColor(QColor());
+            break;
+        default:
             handleRightButtonMouseRelease(e);
         }
     }
-    if(e.fButton != Qt::LeftButton) return;
+    if (e.fButton != Qt::LeftButton) { return; }
     schedulePivotUpdate();
     /*if(mCurrentMode == CanvasMode::paint) {
         const auto paintMode = mDocument.fPaintMode;

src/core/canvasmouseinteractions.cpp

@@ -51,6 +51,8 @@
 #include "MovablePoints/smartnodepoint.h"
 #include "MovablePoints/pathpivot.h"
 
+#include <QDesktopWidget>
+#include <QScreen>
 #include <QMouseEvent>
 #include <QMenu>
 #include <QInputDialog>
@@ -242,7 +244,7 @@ void Canvas::handleLeftButtonMousePress(const eMouseEvent& e) {
             mDrawPath.lineTo(e.fPos);
         }
     } else if(mCurrentMode == CanvasMode::pickFillStroke) {
-        mPressedBox = getBoxAtFromAllDescendents(e.fPos);
+        //mPressedBox = getBoxAtFromAllDescendents(e.fPos);
     } else if(mCurrentMode == CanvasMode::circleCreate) {
         const auto newPath = enve::make_shared<Circle>();
         newPath->planCenterPivotPosition();
@@ -512,6 +514,17 @@ void Canvas::drawPathFinish(const qreal invScale) {
     drawPathClear();
 }
 
+const QColor Canvas::pickPixelColor(const QPoint &pos)
+{
+    QScreen *screen = QApplication::screenAt(pos);
+    if (!screen) { return QColor(); }
+    WId wid = QApplication::desktop()->winId();
+    QImage img = screen->grabWindow(wid,
+                                    pos.x(), pos.y(),
+                                    1, 1).toImage();
+    return QColor(img.pixel(0, 0));
+}
+
 void Canvas::handleLeftMouseRelease(const eMouseEvent &e) {
     if(e.fMouseGrabbing) e.fReleaseMouse();
     if(mCurrentNormalSegment.isValid()) {
@@ -541,31 +554,7 @@ void Canvas::handleLeftMouseRelease(const eMouseEvent &e) {
             drawPathFinish(1/e.fScale);
         }
     } else if(mCurrentMode == CanvasMode::pickFillStroke) {
-        if(mPressedBox && enve_cast<PathBox*>(mPressedBox)) {
-            const auto srcPathBox = static_cast<PathBox*>(mPressedBox.data());
-            for(const auto& box : mSelectedBoxes) {
-                if(const auto pathBox = enve_cast<PathBox*>(box)) {
-                    if(e.ctrlMod()) {
-                        if(e.shiftMod()) {
-                            pathBox->duplicateStrokeSettingsFrom(
-                                        srcPathBox->getStrokeSettings());
-                        } else {
-                            pathBox->duplicateFillSettingsFrom(
-                                        srcPathBox->getFillSettings());
-                        }
-                    } else {
-                        if(e.shiftMod()) {
-                            pathBox->duplicateStrokeSettingsNotAnimatedFrom(
-                                        srcPathBox->getStrokeSettings());
-                        } else {
-                            pathBox->duplicateFillSettingsNotAnimatedFrom(
-                                        srcPathBox->getFillSettings());
-                        }
-                    }
-                }
-            }
-        }
-        //mCanvasWindow->setCanvasMode(MOVE_PATH);
+        emit currentPickedColor(pickPixelColor(e.fGlobalPos));
     }
     mValueInput.clearAndDisableInput();
     mTransMode = TransformMode::none;

src/ui/CMakeLists.txt

@@ -75,7 +75,6 @@ set(
     widgets/canvassettingswidget.cpp
     widgets/canvastoolbar.cpp
     widgets/changewidthwidget.cpp
-    widgets/colorpickingwidget.cpp
     widgets/colortoolbar.cpp
     widgets/colortoolbutton.cpp
     widgets/colorlabel.cpp
@@ -147,7 +146,6 @@ set(
     widgets/canvassettingswidget.h
     widgets/canvastoolbar.h
     widgets/changewidthwidget.h
-    widgets/colorpickingwidget.h
     widgets/colortoolbar.h
     widgets/colortoolbutton.h
     widgets/colorlabel.h