diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-12-07 16:03:50 -0800 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-12-07 16:03:50 -0800 |
commit | 7ec5e1385a70a7ddafa2fbdf9bd023757feedad9 (patch) | |
tree | 5b0aae2c2c60ef16ce0b01b2bfb05d09b5fce4a7 /grc/gui/Block.py | |
parent | 6f31b6e1dbb8f2474f6d95418d09145b0ceeecac (diff) | |
parent | 9587f5b34914f8ccbb05db093a024cf117b60a44 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'grc/gui/Block.py')
-rw-r--r-- | grc/gui/Block.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/grc/gui/Block.py b/grc/gui/Block.py index 8c74fcb4a5..67b80695fa 100644 --- a/grc/gui/Block.py +++ b/grc/gui/Block.py @@ -206,7 +206,7 @@ class Block(Element): #display the params if self.is_dummy_block(): markups = [ - '<span foreground="black" font_desc="$font"><b>key: </b>{key}</span>'.format(font=PARAM_FONT, key=self._key) + '<span foreground="black" font_desc="{font}"><b>key: </b>{key}</span>'.format(font=PARAM_FONT, key=self._key) ] else: markups = [param.get_markup() for param in self.get_params() if param.get_hide() not in ('all', 'part')] @@ -215,7 +215,7 @@ class Block(Element): layout.set_spacing(LABEL_SEPARATION*pango.SCALE) layout.set_markup('\n'.join(markups)) layouts.append(layout) - w,h = layout.get_pixel_size() + w, h = layout.get_pixel_size() self.label_width = max(w, self.label_width) self.label_height += h + LABEL_SEPARATION width = self.label_width |