diff --git a/.github/workflows/MacOS-pack.yml b/.github/workflows/MacOS-pack.yml index e20b927bd6..9662703a15 100644 --- a/.github/workflows/MacOS-pack.yml +++ b/.github/workflows/MacOS-pack.yml @@ -75,7 +75,7 @@ jobs: echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV - name: Install Qt - run: brew install qt@6 cmake + run: brew install qt@6 - name: Configure run: | diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp index a152bb352c..fd8667869a 100644 --- a/src/widgets/capture/capturewidget.cpp +++ b/src/widgets/capture/capturewidget.cpp @@ -981,6 +981,7 @@ void CaptureWidget::mouseReleaseEvent(QMouseEvent* e) m_context.color.isValid()) { pushObjectsStateToUndoStack(); } + m_colorPicker->setNewColor(); m_colorPicker->hide(); if (!m_context.color.isValid()) { m_context.color = ConfigHandler().drawColor(); diff --git a/src/widgets/capture/colorpicker.cpp b/src/widgets/capture/colorpicker.cpp index 102dfed7b8..6032974dd4 100644 --- a/src/widgets/capture/colorpicker.cpp +++ b/src/widgets/capture/colorpicker.cpp @@ -22,6 +22,10 @@ ColorPicker::ColorPicker(QWidget* parent) } } } +void ColorPicker::setNewColor() +{ + emit colorSelected(m_colorList.at(m_selectedIndex)); +} void ColorPicker::mouseMoveEvent(QMouseEvent* e) { @@ -44,5 +48,4 @@ void ColorPicker::showEvent(QShowEvent* event) void ColorPicker::hideEvent(QHideEvent* event) { releaseMouse(); - emit colorSelected(m_colorList.at(m_selectedIndex)); } diff --git a/src/widgets/capture/colorpicker.h b/src/widgets/capture/colorpicker.h index 979bdc22ff..2f3414204d 100644 --- a/src/widgets/capture/colorpicker.h +++ b/src/widgets/capture/colorpicker.h @@ -10,7 +10,7 @@ class ColorPicker : public ColorPickerWidget Q_OBJECT public: explicit ColorPicker(QWidget* parent = nullptr); - + void setNewColor(); signals: void colorSelected(QColor c);