diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-06-14 09:19:03 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-06-14 09:19:03 -0700 |
commit | 7ee2f91d3c51498a6d1923fb47f47b882c9a77e5 (patch) | |
tree | 525e79df13a027722b88fc0f031696833fed46ec /grc/gui/Block.py | |
parent | a80edf4570d75f1325dce7e026e166956bb1db5f (diff) | |
parent | 91dd2fce59ba81d4dc22b9dcdc909211cafe9f5f (diff) |
Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'
Diffstat (limited to 'grc/gui/Block.py')
-rw-r--r-- | grc/gui/Block.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/grc/gui/Block.py b/grc/gui/Block.py index 60f19fc1a4..83706ed1aa 100644 --- a/grc/gui/Block.py +++ b/grc/gui/Block.py @@ -145,7 +145,9 @@ class Block(Element): """Create the labels for the signal block.""" Element.create_labels(self) self._bg_color = self.is_dummy_block() and Colors.MISSING_BLOCK_BACKGROUND_COLOR or \ + self.get_bypassed() and Colors.BLOCK_BYPASSED_COLOR or \ self.get_enabled() and Colors.BLOCK_ENABLED_COLOR or Colors.BLOCK_DISABLED_COLOR + layouts = list() #create the main layout layout = gtk.DrawingArea().create_pango_layout('') |