From d86fb54b1965ea090c0d5e4aff29de51e15a822c Mon Sep 17 00:00:00 2001 From: rubenthoms Date: Thu, 17 Sep 2020 16:17:44 +0200 Subject: [PATCH] Implemented check if running GUI application. --- ApplicationCode/UserInterface/RiuGuiTheme.cpp | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ApplicationCode/UserInterface/RiuGuiTheme.cpp b/ApplicationCode/UserInterface/RiuGuiTheme.cpp index e38066b80d..017e9f7274 100644 --- a/ApplicationCode/UserInterface/RiuGuiTheme.cpp +++ b/ApplicationCode/UserInterface/RiuGuiTheme.cpp @@ -18,10 +18,10 @@ #include "RiuGuiTheme.h" -#include "RiuThemesDirectory.h" - +#include "RiaApplication.h" #include "RiaGuiApplication.h" #include "RiaPreferences.h" +#include "RiuThemesDirectory.h" #include "cafAppEnum.h" #include @@ -564,15 +564,18 @@ QAbstractItemModel* RiuGuiTheme::getQssCompletionModel( QCompleter* completer ) //-------------------------------------------------------------------------------------------------- QColor RiuGuiTheme::getColorByVariableName( const QString& variable, int theme /*= -1 */ ) { - RiaDefines::ThemeEnum eTheme = RiaGuiApplication::instance()->preferences()->guiTheme(); - if ( theme >= 0 && theme < static_cast( caf::AppEnum().size() ) ) + if ( dynamic_cast( RiaApplication::instance() ) ) { - eTheme = static_cast( theme ); - } + RiaDefines::ThemeEnum eTheme = RiaGuiApplication::instance()->preferences()->guiTheme(); + if ( theme >= 0 && theme < static_cast( caf::AppEnum().size() ) ) + { + eTheme = static_cast( theme ); + } - if ( s_variableValueMap.keys().contains( eTheme ) && s_variableValueMap[eTheme].keys().contains( "$" + variable ) ) - { - return QColor( s_variableValueMap[eTheme]["$" + variable] ); + if ( s_variableValueMap.keys().contains( eTheme ) && s_variableValueMap[eTheme].keys().contains( "$" + variable ) ) + { + return QColor( s_variableValueMap[eTheme]["$" + variable] ); + } } return Qt::black; }