smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-10 07:26:32 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Removing hard coding of the piece of layout where menu_bar is resides.

Browse source
This commit is contained in:
VKamyshniy 2014-09-15 16:58:26 +03:00
parent e6aa280712
commit 02af44fee3
4 changed files with 3 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.h
View file

@ -564,8 +564,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
/* menu bar and associated stuff */
Gtk::MenuBar* menu_bar;
Gtk::EventBox menu_bar_base;
Gtk::HBox menu_hbox;
void use_menubar_as_top_menubar ();
void build_menu_bar ();

3
gtk2_ardour/ardour_ui2.cc
View file

@ -88,9 +88,6 @@ ARDOUR_UI::setup_windows ()
we_have_dependents ();
#ifndef TOP_MENUBAR
editor->get_h_box ("menu_bar_base").pack_start (menu_bar_base, false, false);
#endif
if (ARDOUR::Profile->get_trx()) {
top_packer.pack_start (tracks_tools_packer, false, false);
} else {

25
gtk2_ardour/ardour_ui_ed.cc
View file

@ -772,29 +772,8 @@ ARDOUR_UI::build_menu_bar ()
// so use this instead ...
gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers");
EventBox* ev = manage (new EventBox);
ev->show ();
CairoHPacker* hbox = manage (new CairoHPacker);
hbox->set_name (X_("StatusBarBox"));
hbox->show ();
hbox->set_border_width (3);
VBox* vbox = manage (new VBox);
vbox->pack_start (*hbox, true, false);
vbox->show();
ev->add (*vbox);
#ifndef TOP_MENUBAR
menu_hbox.pack_start (*menu_bar, false, false);
#else
use_menubar_as_top_menubar ();
#endif
// menu_hbox.pack_end (*ev, false, false, 6);
menu_bar_base.set_name ("MainMenuBar");
menu_bar_base.add (menu_hbox);
editor->get_h_box ("menu_bar_home").pack_start (*menu_bar, false, false);
return;
}
void

4
gtk2_ardour/ui/editor_window.xml
View file

@ -38,9 +38,7 @@
maxvalue="10"
step="0.2"
pagesize="2.0"/>
<HBox>
<HBox id="menu_bar_base"/>
</HBox>
<HBox id="menu_bar_home"/>
<EventBox bgnormal="#000000">
<VBox borderwidth="2" spacing ="1">
<EventBox bgnormal="#282828">