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

#6514 Dark Theme : Refactor use of black

Browse Source
This commit is contained in:
Magne Sjaastad 2020-09-16 13:51:57 +02:00 committed by Gaute Lindkvist
parent 9bbbfc5088
commit 0b44f6ab18
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/UserInterface/RiuGridCrossQwtPlot.cpp
View File

@ -214,7 +214,10 @@ void RiuGridCrossQwtPlot::onPlotItemSelected( QwtPlotItem* plotItem, bool toggle
QwtText curveLabel( labelString, QwtText::RichText ); QwtText curveLabel( labelString, QwtText::RichText );
curveLabel.setBackgroundBrush( QBrush( QColor( 250, 250, 250, 220 ) ) ); curveLabel.setBackgroundBrush( QBrush( QColor( 250, 250, 250, 220 ) ) );
curveLabel.setPaintAttribute( QwtText::PaintBackground ); curveLabel.setPaintAttribute( QwtText::PaintBackground );
curveLabel.setBorderPen( QPen( Qt::black, 1.0 ) );
auto color = RiuGuiTheme::getColorByVariableName( "markerColor" );
curveLabel.setBorderPen( QPen( color, 1.0 ) );
curveLabel.setBorderRadius( 2.0 ); curveLabel.setBorderRadius( 2.0 );
m_selectedPointMarker->setLabel( curveLabel ); m_selectedPointMarker->setLabel( curveLabel );
} }

6
ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp
View File

@ -26,6 +26,7 @@
#include "RimPlot.h" #include "RimPlot.h"
#include "RiuDraggableOverlayFrame.h" #include "RiuDraggableOverlayFrame.h"
#include "RiuGuiTheme.h"
#include "RiuPlotMainWindowTools.h" #include "RiuPlotMainWindowTools.h"
#include "RiuQwtCurvePointTracker.h" #include "RiuQwtCurvePointTracker.h"
#include "RiuQwtLinearScaleEngine.h" #include "RiuQwtLinearScaleEngine.h"
@ -1095,7 +1096,10 @@ void RiuQwtPlotWidget::resetPlotItemHighlighting()
else if ( plotShapeItem ) else if ( plotShapeItem )
{ {
QPen pen = plotShapeItem->pen(); QPen pen = plotShapeItem->pen();
pen.setColor( QColor( Qt::black ) );
auto color = RiuGuiTheme::getColorByVariableName( "markerColor" );
pen.setColor( color );
pen.setWidth( 1 ); pen.setWidth( 1 );
plotShapeItem->setPen( pen ); plotShapeItem->setPen( pen );
plotShapeItem->setZ( plotShapeItem->z() - 100.0 ); plotShapeItem->setZ( plotShapeItem->z() - 100.0 );

3
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
View File

@ -393,12 +393,11 @@ void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaEclipseUnitTools::Uni
break; break;
} }
const QPen curvePen( Qt::black, 1, penStyle ); const QPen curvePen( QBrush(), 1, penStyle );
qwtCurve->setPen( curvePen ); qwtCurve->setPen( curvePen );
QwtSymbol* curveSymbol = new QwtSymbol( QwtSymbol::Ellipse ); QwtSymbol* curveSymbol = new QwtSymbol( QwtSymbol::Ellipse );
curveSymbol->setSize( 6, 6 ); curveSymbol->setSize( 6, 6 );
curveSymbol->setPen( Qt::black );
curveSymbol->setBrush( Qt::NoBrush ); curveSymbol->setBrush( Qt::NoBrush );
qwtCurve->setSymbol( curveSymbol ); qwtCurve->setSymbol( curveSymbol );