diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2017-01-11 21:14:37 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2017-01-11 21:33:29 +0100 |
| commit | e1eccf55ae78738d102e48bea4804a02fb41f12d (patch) | |
| tree | feef294245c7a0b50ebd0a9ed62a43500f9bb671 /grc/gui/canvas/connection.py | |
| parent | 502c63d341bd839f597a3d23708c72e2aa888bf1 (diff) | |
grc: gtk3: invalid connection all red
Diffstat (limited to 'grc/gui/canvas/connection.py')
| -rw-r--r-- | grc/gui/canvas/connection.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/grc/gui/canvas/connection.py b/grc/gui/canvas/connection.py index 1da63be389..a58a02657e 100644 --- a/grc/gui/canvas/connection.py +++ b/grc/gui/canvas/connection.py @@ -50,7 +50,7 @@ class Connection(CoreConnection, Drawable): self._line = [] self._line_width_factor = 1.0 - self._color = self._color2 = self._arrow_color = None + self._color1 = self._color2 = None self._current_port_rotations = self._current_coordinates = None @@ -99,15 +99,14 @@ class Connection(CoreConnection, Drawable): if source.domain == GR_MESSAGE_DOMAIN: self._line_width_factor = 1.0 - self._color = None + self._color1 = None self._color2 = colors.CONNECTION_ENABLED_COLOR else: if source.domain != sink.domain: self._line_width_factor = 2.0 - self._color = get_domain_color(source.domain) + self._color1 = get_domain_color(source.domain) self._color2 = get_domain_color(sink.domain) - self._arrow_color = self._color2 if self.is_valid() else colors.CONNECTION_ERROR_COLOR self._arrow_rotation = -sink.rotation / 180 * pi if not self._bounding_points: @@ -155,11 +154,13 @@ class Connection(CoreConnection, Drawable): self._make_path(cr) self._current_coordinates = new_coordinates - color1, color2, arrow_color = ( + color1, color2 = ( None if color is None else colors.HIGHLIGHT_COLOR if self.highlighted else - colors.CONNECTION_DISABLED_COLOR if not self.enabled else color - for color in (self._color, self._color2, self._arrow_color) + colors.CONNECTION_DISABLED_COLOR if not self.enabled else + colors.CONNECTION_ERROR_COLOR if not self.is_valid() else + color + for color in (self._color1, self._color2) ) cr.translate(*self.coordinate) @@ -183,7 +184,7 @@ class Connection(CoreConnection, Drawable): cr.new_path() cr.move_to(*arrow_pos) - cr.set_source_rgba(*arrow_color) + cr.set_source_rgba(*color2) cr.rotate(self._arrow_rotation) cr.rel_move_to(CONNECTOR_ARROW_HEIGHT, 0) cr.rel_line_to(-CONNECTOR_ARROW_HEIGHT, -CONNECTOR_ARROW_BASE/2) |