Skip to content

Commit

Permalink
Fix some ugly appearance of data defined buttons
Browse files Browse the repository at this point in the history
(cherry picked from commit 87f50c3)
  • Loading branch information
nyalldawson committed Apr 6, 2020
1 parent b2cafd4 commit 9d1c087
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions python/plugins/processing/modeler/ModelerParametersDialog.py
Expand Up @@ -72,6 +72,9 @@ def __init__(self, alg, model, algName=None, configuration=None):
QDialog.__init__(self)
self.setModal(True)

if iface is not None:
self.setStyleSheet(iface.mainWindow().styleSheet())

self._alg = alg # The algorithm to define in this dialog. It is an instance of QgsProcessingAlgorithm
self.model = model # The model this algorithm is going to be added to. It is an instance of QgsProcessingModelAlgorithm
self.childId = algName # The name of the algorithm in the model, in case we are editing it and not defining it for the first time
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgssymbolbutton.cpp
Expand Up @@ -120,7 +120,7 @@ void QgsSymbolButton::showSettingsDialog()
}
else
{
QgsSymbolSelectorDialog dialog( newSymbol, QgsStyle::defaultStyle(), mLayer, nullptr );
QgsSymbolSelectorDialog dialog( newSymbol, QgsStyle::defaultStyle(), mLayer, this );
dialog.setWindowTitle( mDialogTitle );
dialog.setContext( symbolContext );
if ( dialog.exec() )
Expand Down
1 change: 1 addition & 0 deletions src/gui/symbology/qgssymbolselectordialog.cpp
Expand Up @@ -772,6 +772,7 @@ QgsSymbolSelectorDialog::QgsSymbolSelectorDialog( QgsSymbol *symbol, QgsStyle *s
: QDialog( parent )
{
setLayout( new QVBoxLayout() );

mSelectorWidget = new QgsSymbolSelectorWidget( symbol, style, vl, this );
mButtonBox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok );

Expand Down

0 comments on commit 9d1c087

Please sign in to comment.