diff options
| author | Seth Hitefield <sdhitefield@gmail.com> | 2016-08-09 16:07:20 -0400 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-08-10 20:32:58 +0200 |
| commit | 63beff38d49cda141ccfebaee597a7edb7ac015d (patch) | |
| tree | d8951c24cd3caf08b3801a5aed0be1680acd34cd | |
| parent | 8e2886dc6b45b4e3f68d84887f728483fd2d1538 (diff) | |
grc: gtk3: Tweaked color styles for ports
| -rw-r--r-- | grc/gui/Colors.py | 2 | ||||
| -rw-r--r-- | grc/gui/Port.py | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/grc/gui/Colors.py b/grc/gui/Colors.py index 73a0f5ab5f..acc7f22c44 100644 --- a/grc/gui/Colors.py +++ b/grc/gui/Colors.py @@ -43,7 +43,7 @@ def get_color(color_code): ################################################################################# HIGHLIGHT_COLOR = get_color('#00FFFF') -BORDER_COLOR = get_color('#444444') +BORDER_COLOR = get_color('#616161') BORDER_COLOR_DISABLED = get_color('#888888') FONT_COLOR = get_color('#000000') diff --git a/grc/gui/Port.py b/grc/gui/Port.py index d995470fdb..258ae244ab 100644 --- a/grc/gui/Port.py +++ b/grc/gui/Port.py @@ -45,6 +45,8 @@ class Port(_Port, Element): self._area = [] self._bg_color = self._border_color = 0, 0, 0, 0 + self._font_color = list(Colors.FONT_COLOR) + self._line_width_factor = 1.0 self._label_layout_offsets = 0, 0 @@ -72,15 +74,15 @@ class Port(_Port, Element): a hex color code. """ if not self.parent_block.enabled: - self._bg_color = Colors.BLOCK_DISABLED_COLOR - self._border_color = Colors.BORDER_COLOR_DISABLED - return - - color = Colors.PORT_TYPE_TO_COLOR.get(self.get_type()) or Colors.PORT_TYPE_TO_COLOR.get('') - vlen = self.get_vlen() - if vlen > 1: - dark = (0, 0, 30 / 255.0, 50 / 255.0, 70 / 255.0)[min(4, vlen)] - color = tuple(max(c - dark, 0) for c in color) + self._font_color[-1] = 0.4 + color = Colors.BLOCK_DISABLED_COLOR + else: + self._font_color[-1] = 1.0 + color = Colors.PORT_TYPE_TO_COLOR.get(self.get_type()) or Colors.PORT_TYPE_TO_COLOR.get('') + vlen = self.get_vlen() + if vlen > 1: + dark = (0, 0, 30 / 255.0, 50 / 255.0, 70 / 255.0)[min(4, vlen)] + color = tuple(max(c - dark, 0) for c in color) self._bg_color = color self._border_color = tuple(max(c - 0.3, 0) for c in color) @@ -127,7 +129,7 @@ class Port(_Port, Element): """ Draw the socket with a label. """ - border_color = Colors.HIGHLIGHT_COLOR if self.highlighted else self._border_color + border_color = self._border_color cr.set_line_width(self._line_width_factor * cr.get_line_width()) cr.translate(*self.coordinate) @@ -145,7 +147,7 @@ class Port(_Port, Element): cr.translate(-self.width, 0) cr.translate(*self._label_layout_offsets) - cr.set_source_rgba(*Colors.FONT_COLOR) + cr.set_source_rgba(*self._font_color) PangoCairo.update_layout(cr, self.label_layout) PangoCairo.show_layout(cr, self.label_layout) |