mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 09:06:43 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2105 from Capostrophic/colorpicker

Browse source 
[0.45.0 regression] Editor: Fix color picker oddities
This commit is contained in:
Bret Curtis 2019-02-06 10:07:21 +01:00 committed by GitHub
commit 9e8bc29e3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/view/widget/coloreditor.cpp
View file

@ -82,6 +82,7 @@ void CSVWidget::ColorEditor::setColor(const int colorInt)
void CSVWidget::ColorEditor::showPicker() void CSVWidget::ColorEditor::showPicker()
{ {
mColorPicker->showPicker(calculatePopupPosition(), mColor); mColorPicker->showPicker(calculatePopupPosition(), mColor);
emit pickingFinished();
} }
void CSVWidget::ColorEditor::pickerColorChanged(const QColor &color) void CSVWidget::ColorEditor::pickerColorChanged(const QColor &color)

3
apps/opencs/view/widget/colorpickerpopup.cpp
View file

@ -39,7 +39,8 @@ void CSVWidget::ColorPickerPopup::showPicker(const QPoint &position, const QColo
// Calling getColor() creates a blocking dialog that will continue execution once the user chooses OK or Cancel // Calling getColor() creates a blocking dialog that will continue execution once the user chooses OK or Cancel
QColor color = mColorPicker->getColor(initialColor); QColor color = mColorPicker->getColor(initialColor);
mColorPicker->setCurrentColor(color); if (color.isValid())
mColorPicker->setCurrentColor(color);
} }
void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent *event) void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent *event)