diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-04 10:41:49 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-04 10:41:49 -0700 |
| commit | 61c4e2f62d18b3b2f0663b8c0a54a105d3896883 (patch) | |
| tree | 1ee92dc79a2d257c45e0b32a470833057344cdea /grc/gui/PropsDialog.py | |
| parent | 0e4f02cfee57c73712a8bb21b408d69d9fcfe1b9 (diff) | |
| parent | fa2abde0a0c9c1430ca1c4bb470ddb35e18c0ee2 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc/gui/PropsDialog.py')
| -rw-r--r-- | grc/gui/PropsDialog.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/grc/gui/PropsDialog.py b/grc/gui/PropsDialog.py index 1045cfbbdc..083e42d026 100644 --- a/grc/gui/PropsDialog.py +++ b/grc/gui/PropsDialog.py @@ -169,7 +169,8 @@ class PropsDialog(gtk.Dialog): if param.get_hide() == 'all': continue box_all_valid = box_all_valid and param.is_valid() - vbox.pack_start(param.get_input(self._handle_changed, self._activate_apply), False) + input_widget = param.get_input(self._handle_changed, self._activate_apply) + vbox.pack_start(input_widget, input_widget.expand) label.set_markup(Utils.parse_template(TAB_LABEL_MARKUP_TMPL, valid=box_all_valid, tab=tab)) #show params box with new params vbox.show_all() @@ -191,7 +192,10 @@ class PropsDialog(gtk.Dialog): Returns: false to forward the keypress """ - if event.keyval == gtk.keysyms.Return and event.state & gtk.gdk.CONTROL_MASK == 0: + if (event.keyval == gtk.keysyms.Return and + event.state & gtk.gdk.CONTROL_MASK == 0 and + not isinstance(widget.get_focus(), gtk.TextView) + ): self.response(gtk.RESPONSE_ACCEPT) return True # handled here return False # forward the keypress |