MacOS: Move status info to top, just like win+linux. (but no menu up there of course.)
This commit is contained in:
parent
97fb3a5557
commit
5c741bf8c5
@ -132,7 +132,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
|
||||
gint
|
||||
ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
|
||||
{
|
||||
#ifdef TOP_MENUBAR
|
||||
#ifdef GTKOSX
|
||||
/* just hide the window, and return - the top menu stays up */
|
||||
editor->hide ();
|
||||
return TRUE;
|
||||
@ -276,25 +276,7 @@ ARDOUR_UI::setup_windows ()
|
||||
|
||||
we_have_dependents ();
|
||||
|
||||
#ifdef TOP_MENUBAR
|
||||
EventBox* status_bar_event_box = manage (new EventBox);
|
||||
|
||||
status_bar_event_box->add (status_bar_label);
|
||||
status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
|
||||
status_bar_label.set_size_request (300, -1);
|
||||
status_bar_label.set_ellipsize (Pango::ELLIPSIZE_END);
|
||||
status_bar_label.set_single_line_mode (true);
|
||||
|
||||
status_bar_label.show ();
|
||||
status_bar_event_box->show ();
|
||||
|
||||
status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press));
|
||||
|
||||
status_bar_hpacker.pack_start (*status_bar_event_box, true, true, 6);
|
||||
status_bar_hpacker.pack_start (menu_bar_base, false, false, 2);
|
||||
#else
|
||||
top_packer.pack_start (menu_bar_base, false, false);
|
||||
#endif
|
||||
|
||||
main_vpacker.pack_start (top_packer, false, false);
|
||||
|
||||
@ -303,10 +285,6 @@ ARDOUR_UI::setup_windows ()
|
||||
main_vpacker.pack_start (transport_frame, false, false);
|
||||
main_vpacker.pack_start (_tabs, true, true);
|
||||
|
||||
#ifdef TOP_MENUBAR
|
||||
main_vpacker.pack_start (status_bar_hpacker, false, false);
|
||||
#endif
|
||||
|
||||
LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_action_script_btn));
|
||||
|
||||
for (int i = 0; i < 9; ++i) {
|
||||
|
@ -700,10 +700,10 @@ ARDOUR_UI::build_menu_bar ()
|
||||
format_label.set_name ("Format");
|
||||
format_label.set_use_markup ();
|
||||
|
||||
#ifndef TOP_MENUBAR
|
||||
menu_hbox.pack_start (*menu_bar, false, false);
|
||||
#else
|
||||
#ifdef GTKOSX
|
||||
use_menubar_as_top_menubar ();
|
||||
#else
|
||||
menu_hbox.pack_start (*menu_bar, false, false);
|
||||
#endif
|
||||
|
||||
hbox->pack_end (error_alert_button, false, false, 2);
|
||||
|
Loading…
Reference in New Issue
Block a user