diff options
Diffstat (limited to 'grc/gui/canvas/port.py')
| -rw-r--r-- | grc/gui/canvas/port.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/grc/gui/canvas/port.py b/grc/gui/canvas/port.py index b74e4adfcc..2ea35f3dd3 100644 --- a/grc/gui/canvas/port.py +++ b/grc/gui/canvas/port.py @@ -26,8 +26,9 @@ from gi.repository import Gtk, PangoCairo, Pango from . import colors from .drawable import Drawable from .. import Actions, Utils, Constants -from ...core.Element import nop_write -from ...core.Port import Port as CorePort + +from ...core.utils.descriptors import nop_write +from ...core.ports import Port as CorePort class Port(CorePort, Drawable): @@ -75,12 +76,13 @@ class Port(CorePort, Drawable): if not self.parent_block.enabled: self._font_color[-1] = 0.4 color = colors.BLOCK_DISABLED_COLOR + elif self.domain == Constants.GR_MESSAGE_DOMAIN: + color = colors.PORT_TYPE_TO_COLOR.get('message') 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 = colors.PORT_TYPE_TO_COLOR.get(self.dtype) or colors.PORT_TYPE_TO_COLOR.get('') + if self.vlen > 1: + dark = (0, 0, 30 / 255.0, 50 / 255.0, 70 / 255.0)[min(4, self.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) @@ -108,7 +110,7 @@ class Port(CorePort, Drawable): if cr: PangoCairo.update_layout(cr, self.label_layout) - if self.domain in (Constants.GR_MESSAGE_DOMAIN, Constants.DEFAULT_DOMAIN): + if self.domain in (Constants.GR_MESSAGE_DOMAIN, Constants.GR_STREAM_DOMAIN): self._line_width_factor = 1.0 else: self._line_width_factor = 2.0 @@ -124,9 +126,9 @@ class Port(CorePort, Drawable): self.width = 2 * Constants.PORT_LABEL_PADDING + label_width / Pango.SCALE self.height = 2 * Constants.PORT_LABEL_PADDING + label_height / Pango.SCALE self._label_layout_offsets = [0, Constants.PORT_LABEL_PADDING] - if self.get_type() == 'bus': - self.height += Constants.PORT_EXTRA_BUS_HEIGHT - self._label_layout_offsets[1] += Constants.PORT_EXTRA_BUS_HEIGHT / 2 + # if self.dtype == 'bus': + # self.height += Constants.PORT_EXTRA_BUS_HEIGHT + # self._label_layout_offsets[1] += Constants.PORT_EXTRA_BUS_HEIGHT / 2 self.height += self.height % 2 # uneven height def draw(self, cr): |