OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do nothing if color dialog is closed using Escape button

Browse Source
This commit is contained in:
Magne Sjaastad 2020-09-20 12:03:08 +02:00 committed by Gaute Lindkvist
parent 719feac15e
commit f981cf2ce0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/Commands/RicThemeColorEditorFeature.cpp
View File

@ -121,11 +121,14 @@ void RicThemeColorEditorFeature::onActionTriggered( bool isChecked )
&QPushButton::clicked, &QPushButton::clicked,
[this, variableValueMap, variableName, theme, editor, widget, colorBox]() -> void { [this, variableValueMap, variableName, theme, editor, widget, colorBox]() -> void {
QColor color = QColorDialog::getColor( colorBox->palette().color( QPalette::Button ), widget ); QColor color = QColorDialog::getColor( colorBox->palette().color( QPalette::Button ), widget );
colorBox->setStyleSheet( QString( "background-color: %0;" ).arg( color.name() ) ); if ( color.isValid() )
colorBox->style()->unpolish( colorBox ); {
colorBox->style()->polish( colorBox ); colorBox->setStyleSheet( QString( "background-color: %0;" ).arg( color.name() ) );
RiuGuiTheme::changeVariableValue( theme, variableName, color.name() ); colorBox->style()->unpolish( colorBox );
editor->setPlainText( RiuGuiTheme::applyVariableValueMapToStyleSheet( theme ) ); colorBox->style()->polish( colorBox );
RiuGuiTheme::changeVariableValue( theme, variableName, color.name() );
editor->setPlainText( RiuGuiTheme::applyVariableValueMapToStyleSheet( theme ) );
}
} ); } );
innerLayout->addWidget( colorBox, row++, column + 1 ); innerLayout->addWidget( colorBox, row++, column + 1 );
if ( row == 10 ) if ( row == 10 )