diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-16 15:55:59 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-16 15:55:59 +0100 |
| commit | 75b933eadbe8f90a73a29bb207ff26eebcd4121a (patch) | |
| tree | 65c8206dce7333a7eea5151a6c78126303e7cb26 /libs/surfaces | |
| parent | 97c68cc2b1f302521244e139a8a49019702038e7 (diff) | |
| parent | cb3abec9665b7a69702294e5a6ffdd26f54885c3 (diff) | |
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/gui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc index 1a063b674e..ebb9fd584e 100644 --- a/libs/surfaces/mackie/gui.cc +++ b/libs/surfaces/mackie/gui.cc @@ -84,6 +84,7 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p) Gtk::Table* table = Gtk::manage (new Gtk::Table (2, 9)); table->set_row_spacings (4); table->set_col_spacings (6); + table->set_border_width (12); l = manage (new Gtk::Label (_("Device Type:"))); l->set_alignment (1.0, 0.5); table->attach (*l, 0, 1, 0, 1, AttachOptions(FILL|EXPAND), AttachOptions(0)); @@ -182,11 +183,10 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p) fkey_packer->pack_start (function_key_scroller, true, true); fkey_packer->pack_start (*observation_packer, false, false); fkey_packer->set_spacing (12); - function_key_scroller.set_size_request (700,700); function_key_scroller.property_shadow_type() = Gtk::SHADOW_NONE; function_key_scroller.add (function_key_editor); append_page (*fkey_packer, _("Function Keys")); - + build_available_action_menu (); build_function_key_editor (); refresh_function_key_editor (); |