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

Update default theme and adjust use of background colors

Browse Source
This commit is contained in:
Magne Sjaastad
2020-10-02 11:12:25 +02:00
parent c23c735be3
commit b1c2c56d9e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
View File

@@ -185,7 +185,7 @@ RimEclipseContourMapView*
contourMap->setEclipseCase( eclipseCase );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor3" );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor2" );
contourMap->setBackgroundColor( RiaColorTools::fromQColorTo3f( col ) ); // Ignore original view background
caf::PdmDocument::updateUiIconStateRecursively( contourMap );
@@ -227,7 +227,7 @@ RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMapFr
contourMap->setEclipseCase( eclipseCase );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor3" );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor2" );
contourMap->setBackgroundColor( RiaColorTools::fromQColorTo3f( col ) ); // Ignore original view background
contourMap->setDefaultCustomName();
@@ -294,7 +294,7 @@ RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMap(
contourMap->hasUserRequestedAnimation = true;
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor3" );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor2" );
contourMap->setBackgroundColor( RiaColorTools::fromQColorTo3f( col ) ); // Ignore original view background
contourMap->initAfterReadRecursively();
@@ -315,7 +315,7 @@ RimGeoMechContourMapView*
contourMap->setGeoMechCase( geoMechCase );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor3" );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor2" );
contourMap->setBackgroundColor( RiaColorTools::fromQColorTo3f( col ) ); // Ignore original view background
caf::PdmDocument::updateUiIconStateRecursively( contourMap );
@@ -345,7 +345,7 @@ RimGeoMechContourMapView* RicNewContourMapViewFeature::createGeoMechContourMapFr
contourMap->setGeoMechCase( geoMechCase );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor3" );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor2" );
contourMap->setBackgroundColor( RiaColorTools::fromQColorTo3f( col ) ); // Ignore original view background
contourMap->setDefaultCustomName();
@@ -381,7 +381,7 @@ RimGeoMechContourMapView* RicNewContourMapViewFeature::createGeoMechContourMap(
contourMap->hasUserRequestedAnimation = true;
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor3" );
auto col = RiuGuiTheme::getColorByVariableName( "backgroundColor2" );
contourMap->setBackgroundColor( RiaColorTools::fromQColorTo3f( col ) ); // Ignore original view background
contourMap->initAfterReadRecursively();

10
ApplicationCode/Resources/themes/default.qss
View File

@@ -1,10 +1,10 @@
$mainBackgroundColor: #24292e; // Main background color
$backgroundColor1: #394046; // Background color layer 1
$backgroundColor2: #464c53; // Background color layer 2
$backgroundColor3: #5a6067; // Background color layer 3
$mainBackgroundColor: #ffffff; // Main background color
$backgroundColor1: #efefef; // Background color layer 1
$backgroundColor2: #d6d6d6; // Background color layer 2
$backgroundColor3: #848484; // Background color layer 3
$backgroundColor4: #89939d; // Background color layer 4
$backgroundColor5: #adbac6; // Background color layer 5
$textColor: #000000; // Main text color
$textColor: #141719; // Main text color
$primaryColor: #018fa3; // Primary color (buttons etc)
$secondaryColor: #e82257; // Secondary color
$tertiaryColor: #ffc50d; // Tertiary color

2
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -202,7 +202,7 @@ RiuViewer::RiuViewer( const QGLFormat& format, QWidget* parent )
m_windowEdgeAxisOverlay = new RivWindowEdgeAxesOverlayItem( standardFont );
m_showWindowEdgeAxes = false;
auto backgroundColor = RiuGuiTheme::getColorByVariableName( "backgroundColor2" );
auto backgroundColor = RiuGuiTheme::getColorByVariableName( "backgroundColor1" );
auto textColor = RiuGuiTheme::getColorByVariableName( "textColor" );
m_windowEdgeAxisOverlay->setFrameColor( cvf::Color4f( RiaColorTools::fromQColorTo3f( backgroundColor ) ) );
m_windowEdgeAxisOverlay->setTextColor( RiaColorTools::fromQColorTo3f( textColor ) );