Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/MacOS-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions src/widgets/capture/capturewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 4 additions & 1 deletion src/widgets/capture/colorpicker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ ColorPicker::ColorPicker(QWidget* parent)
}
}
}
void ColorPicker::setNewColor()
{
emit colorSelected(m_colorList.at(m_selectedIndex));
}

void ColorPicker::mouseMoveEvent(QMouseEvent* e)
{
Expand All @@ -44,5 +48,4 @@ void ColorPicker::showEvent(QShowEvent* event)
void ColorPicker::hideEvent(QHideEvent* event)
{
releaseMouse();
emit colorSelected(m_colorList.at(m_selectedIndex));
}
2 changes: 1 addition & 1 deletion src/widgets/capture/colorpicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class ColorPicker : public ColorPickerWidget
Q_OBJECT
public:
explicit ColorPicker(QWidget* parent = nullptr);

void setNewColor();
signals:
void colorSelected(QColor c);

Expand Down
Loading