[themes] Fix the processing modeler's rendering on dark backgrounds

qgis · Jan 16, 2019 · 193ae4d · 193ae4d
1 parent 710d568
commit 193ae4d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/python/plugins/processing/modeler/ModelerArrowItem.py b/python/plugins/processing/modeler/ModelerArrowItem.py
@@ -50,8 +50,8 @@
                        QgsProcessingModelChildAlgorithm,
                        QgsProcessingModelParameter)
 from qgis.PyQt.QtCore import Qt, QPointF
-from qgis.PyQt.QtWidgets import QGraphicsPathItem, QGraphicsItem
-from qgis.PyQt.QtGui import QPen, QPainterPath, QPolygonF, QPainter
+from qgis.PyQt.QtWidgets import QApplication, QGraphicsPathItem, QGraphicsItem
+from qgis.PyQt.QtGui import QPen, QPainterPath, QPolygonF, QPainter, QPalette
 from processing.modeler.ModelerGraphicItem import ModelerGraphicItem
 
 
@@ -67,7 +67,7 @@ def __init__(self, startItem, startIndex, endItem, endIndex,
         self.endItem = endItem
         self.endPoints = []
         self.setFlag(QGraphicsItem.ItemIsSelectable, False)
-        self.myColor = Qt.gray
+        self.myColor = QApplication.palette().color(QPalette.WindowText)
         self.setPen(QPen(self.myColor, 1, Qt.SolidLine,
                          Qt.RoundCap, Qt.RoundJoin))
         self.setZValue(0)

diff --git a/python/plugins/processing/modeler/ModelerGraphicItem.py b/python/plugins/processing/modeler/ModelerGraphicItem.py
@@ -30,8 +30,8 @@
 import math
 
 from qgis.PyQt.QtCore import Qt, QPointF, QRectF
-from qgis.PyQt.QtGui import QFont, QFontMetricsF, QPen, QBrush, QColor, QPolygonF, QPicture, QPainter
-from qgis.PyQt.QtWidgets import QGraphicsItem, QMessageBox, QMenu
+from qgis.PyQt.QtGui import QFont, QFontMetricsF, QPen, QBrush, QColor, QPolygonF, QPicture, QPainter, QPalette
+from qgis.PyQt.QtWidgets import QApplication, QGraphicsItem, QMessageBox, QMenu
 from qgis.PyQt.QtSvg import QSvgRenderer
 from qgis.core import (QgsProcessingParameterDefinition,
                        QgsProcessingModelParameter,
@@ -328,7 +328,7 @@ def paint(self, painter, option, widget=None):
         h = fm.ascent()
         pt = QPointF(-ModelerGraphicItem.BOX_WIDTH / 2 + 25, ModelerGraphicItem.BOX_HEIGHT / 2.0 - h + 1)
         painter.drawText(pt, text)
-        painter.setPen(QPen(Qt.black))
+        painter.setPen(QPen(QApplication.palette().color(QPalette.WindowText)))
         if isinstance(self.element, QgsProcessingModelChildAlgorithm):
             h = -(fm.height() * 1.2)
             h = h - ModelerGraphicItem.BOX_HEIGHT / 2.0 + 5

diff --git a/resources/themes/Night Mapping/palette.txt b/resources/themes/Night Mapping/palette.txt
@@ -1,3 +1,4 @@
+0:#aaaaaa
 2:#535353
 5:#222222
 9:#535353