diff options
| author | Robin Gareus <robin@gareus.org> | 2016-12-18 21:39:36 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-12-18 21:39:36 +0100 |
| commit | 06938105a4c4ed4e343acaebf82087002b53e591 (patch) | |
| tree | 156b515bc297436f664028e14b627b4ff3d68513 /gtk2_ardour/editor.cc | |
| parent | dae2dcd53ec10b38f649781450a7a9ff73f8e4d8 (diff) | |
Simplify spacer code
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index f309fdb948..518fdce547 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -87,6 +87,7 @@ #include "actions.h" #include "analysis_window.h" +#include "ardour_spacer.h" #include "audio_clock.h" #include "audio_region_view.h" #include "audio_streamview.h" @@ -758,11 +759,6 @@ Editor::Editor () global_vpacker.set_spacing (2); global_vpacker.set_border_width (0); - //spacer - EventBox *spacer = manage (new EventBox ()); spacer->set_size_request(-1, 1); - spacer->signal_expose_event().connect (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::spacer_expose), false); spacer->show(); -// global_vpacker.pack_start (*spacer, false, false, 0); - global_vpacker.pack_start (toolbar_hbox, false, false); global_vpacker.pack_start (edit_pane, true, true); global_hpacker.pack_start (global_vpacker, true, true); @@ -3190,38 +3186,23 @@ Editor::setup_toolbar () if (!ARDOUR::Profile->get_trx()) { - //spacer - EventBox *spacer = manage (new EventBox ()); spacer->set_size_request(3, 12); - spacer->signal_expose_event().connect (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::spacer_expose), false); spacer->show(); - toolbar_hbox.pack_start (*spacer, false, false, 3); + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); toolbar_hbox.pack_start (_zoom_box, false, false); - //spacer - spacer = manage (new EventBox ()); spacer->set_size_request(3, 12); - spacer->signal_expose_event().connect (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::spacer_expose), false); spacer->show(); - toolbar_hbox.pack_start (*spacer, false, false, 3); + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); toolbar_hbox.pack_start (_track_box, false, false); - //spacer - spacer = manage (new EventBox ()); spacer->set_size_request(3, 12); - spacer->signal_expose_event().connect (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::spacer_expose), false); spacer->show(); - toolbar_hbox.pack_start (*spacer, false, false, 3); + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); toolbar_hbox.pack_start (snap_box, false, false); - //spacer - spacer = manage (new EventBox ()); spacer->set_size_request(3, 12); - spacer->signal_expose_event().connect (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::spacer_expose), false); spacer->show(); - toolbar_hbox.pack_start (*spacer, false, false, 3); + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); toolbar_hbox.pack_start (*ep_box, false, false); - //spacer - spacer = manage (new EventBox ()); spacer->set_size_request(3, 12); - spacer->signal_expose_event().connect (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::spacer_expose), false); spacer->show(); - toolbar_hbox.pack_start (*spacer, false, false, 3); + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); toolbar_hbox.pack_start (*nudge_box, false, false); } |