Changeset 994:e71fbf2ee978 for src/mlx/gui/faultexplain.py

Timestamp:

07/04/19 17:29:58 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Removed conditions on pygobject (re #347)

File:

• src/mlx/gui/faultexplain.py (modified) (2 diffs)

src/mlx/gui/faultexplain.py

@@ -59 +59 @@
         self.show_all()
 
-        if pygobject:
-            styleContext = self.get_style_context()
-            color = styleContext.get_background_color(gtk.StateFlags.NORMAL)
-            fault.override_background_color(0, color)
-        else:
-            style = self.rc_get_style()
-            fault.modify_base(0, style.bg[0])
+        styleContext = self.get_style_context()
+        color = styleContext.get_background_color(gtk.StateFlags.NORMAL)
+        fault.override_background_color(0, color)
 
         self._hasExplanation = False
@@ -285 +281 @@
         not."""
         allExplained = self._numExplanations >= self._numFaults
-        if pygobject:
-            styleContext = self.get_style_context()
-            if allExplained:
-                outerColour = innerColour = gdk.RGBA(red = 0.0, green=0.0,
-                                                     blue=0.0, alpha=0.0)
-            else:
-                outerColour = \
-                  styleContext.get_border_color(gtk.StateFlags.DROP_ACTIVE)
-                innerColour = self._gui.backgroundColour
-
-            self._outerBox.override_background_color(gtk.StateFlags.NORMAL,
-                                                     outerColour)
-            self._innerBox.override_background_color(gtk.StateFlags.NORMAL,
-                                                     innerColour)
+        styleContext = self.get_style_context()
+        if allExplained:
+            outerColour = innerColour = gdk.RGBA(red = 0.0, green=0.0,
+                                                 blue=0.0, alpha=0.0)
         else:
-            style = self.rc_get_style()
-            self._outerBox.modify_bg(0, style.bg[0 if allExplained else 3])
+            outerColour = \
+                styleContext.get_border_color(gtk.StateFlags.DROP_ACTIVE)
+            innerColour = self._gui.backgroundColour
+
+        self._outerBox.override_background_color(gtk.StateFlags.NORMAL,
+                                                 outerColour)
+        self._innerBox.override_background_color(gtk.StateFlags.NORMAL,
+                                                 innerColour)
 
 #-------------------------------------------------------------------------------