Followup 2ec0513, fix incorrect styling of some GUI elements

nyalldawson · nirvn · commit 22418b47fdd7 · 2019-01-18T22:09:32.000+07:00
diff --git a/src/gui/qgsproxystyle.cpp b/src/gui/qgsproxystyle.cpp
@@ -24,8 +24,12 @@ QgsProxyStyle::QgsProxyStyle( QWidget *parent )
   : QProxyStyle( nullptr ) // no base style yet - it transfers ownership, so we need a NEW QStyle object for the base style
 {
   // get application style
-  QString appStyle = QApplication::style()->objectName();
-  if ( !appStyle.isEmpty() )
+  const QString appStyle = QApplication::style()->objectName();
+  if ( appStyle == QLatin1String( "QgsAppStyle" ) )
+  {
+    setBaseStyle( static_cast< QgsAppStyle * >( QApplication::style() )->clone() );
+  }
+  else if ( !appStyle.isEmpty() )
   {
     if ( QStyle *style = QStyleFactory::create( appStyle ) )
       setBaseStyle( style );
@@ -43,12 +47,15 @@ QgsProxyStyle::QgsProxyStyle( QWidget *parent )
 
 QgsAppStyle::QgsAppStyle( const QString &base )
   : QProxyStyle( nullptr ) // no base style yet - it transfers ownership, so we need a NEW QStyle object for the base style
+  , mBaseStyle( base )
 {
-  if ( !base.isEmpty() )
+  if ( !mBaseStyle.isEmpty() )
   {
-    if ( QStyle *style = QStyleFactory::create( base ) )
+    if ( QStyle *style = QStyleFactory::create( mBaseStyle ) )
       setBaseStyle( style );
   }
+
+  setObjectName( QStringLiteral( "QgsAppStyle" ) );
 }
 
 QPixmap QgsAppStyle::generatedIconPixmap( QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt ) const
@@ -74,4 +81,9 @@ QPixmap QgsAppStyle::generatedIconPixmap( QIcon::Mode iconMode, const QPixmap &p
   return QProxyStyle::generatedIconPixmap( iconMode, pixmap, opt );
 }
 
+QProxyStyle *QgsAppStyle::clone()
+{
+  return new QgsAppStyle( mBaseStyle );
+}
+
 ///@endcond
diff --git a/src/gui/qgsproxystyle.h b/src/gui/qgsproxystyle.h
@@ -57,6 +57,16 @@ class GUI_EXPORT QgsAppStyle : public QProxyStyle
     explicit QgsAppStyle( const QString &base );
     QPixmap generatedIconPixmap( QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt ) const override;
 
+    /**
+     * Returns a new QgsAppStyle instance, with the same base style as this instance.
+     *
+     * Caller takes ownership of the returned object.
+     */
+    QProxyStyle *clone() SIP_FACTORY;
+
+  private:
+
+    QString mBaseStyle;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,12 @@ QgsProxyStyle::QgsProxyStyle( QWidget *parent )`
`24`	`24`	`: QProxyStyle( nullptr ) // no base style yet - it transfers ownership, so we need a NEW QStyle object for the base style`
`25`	`25`	`{`
`26`	`26`	`// get application style`
`27`		`- QString appStyle = QApplication::style()->objectName();`
`28`		`- if ( !appStyle.isEmpty() )`
	`27`	`+ const QString appStyle = QApplication::style()->objectName();`
	`28`	`+ if ( appStyle == QLatin1String( "QgsAppStyle" ) )`
	`29`	`+ {`
	`30`	`+ setBaseStyle( static_cast< QgsAppStyle * >( QApplication::style() )->clone() );`
	`31`	`+ }`
	`32`	`+ else if ( !appStyle.isEmpty() )`
`29`	`33`	`{`
`30`	`34`	`if ( QStyle *style = QStyleFactory::create( appStyle ) )`
`31`	`35`	`setBaseStyle( style );`
`@@ -43,12 +47,15 @@ QgsProxyStyle::QgsProxyStyle( QWidget *parent )`
`43`	`47`
`44`	`48`	`QgsAppStyle::QgsAppStyle( const QString &base )`
`45`	`49`	`: QProxyStyle( nullptr ) // no base style yet - it transfers ownership, so we need a NEW QStyle object for the base style`
	`50`	`+ , mBaseStyle( base )`
`46`	`51`	`{`
`47`		`- if ( !base.isEmpty() )`
	`52`	`+ if ( !mBaseStyle.isEmpty() )`
`48`	`53`	`{`
`49`		`- if ( QStyle *style = QStyleFactory::create( base ) )`
	`54`	`+ if ( QStyle *style = QStyleFactory::create( mBaseStyle ) )`
`50`	`55`	`setBaseStyle( style );`
`51`	`56`	`}`
	`57`	`+`
	`58`	`+ setObjectName( QStringLiteral( "QgsAppStyle" ) );`
`52`	`59`	`}`
`53`	`60`
`54`	`61`	`QPixmap QgsAppStyle::generatedIconPixmap( QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt ) const`
`@@ -74,4 +81,9 @@ QPixmap QgsAppStyle::generatedIconPixmap( QIcon::Mode iconMode, const QPixmap &p`
`74`	`81`	`return QProxyStyle::generatedIconPixmap( iconMode, pixmap, opt );`
`75`	`82`	`}`
`76`	`83`
	`84`	`+QProxyStyle *QgsAppStyle::clone()`
	`85`	`+{`
	`86`	`+ return new QgsAppStyle( mBaseStyle );`
	`87`	`+}`
	`88`	`+`
`77`	`89`	`///@endcond`