palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-30 04:11:32 +02:00
Code Issues Projects Releases Wiki Activity

Fix deprecated QColorDialog::getRgba.

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-12-11 11:48:42 +02:00
parent fc38ce6df1
commit 54e2025439
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp
View file

@ -96,12 +96,10 @@ QString VPE::VColorPropertyEditor::GetColorString(const QColor& color)
void VPE::VColorPropertyEditor::onToolButtonClicked() void VPE::VColorPropertyEditor::onToolButtonClicked()
{ {
bool ok = false; const QColor newColor = QColorDialog::getColor(Color, this, QString(), QColorDialog::ShowAlphaChannel);
QRgb oldRgba = Color.rgba(); if (newColor.isValid() && newColor != Color)
QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this);
if (ok && newRgba != oldRgba)
{ {
SetColor(QColor::fromRgba(newRgba)); SetColor(newColor);
emit dataChangedByUser(Color, this); emit dataChangedByUser(Color, this);
UserChangeEvent *event = new UserChangeEvent(); UserChangeEvent *event = new UserChangeEvent();
QCoreApplication::postEvent ( this, event ); QCoreApplication::postEvent ( this, event );