do not show the mixer window if the (current) screen height is < 700 pixels (since...

git-svn-id: svn://localhost/ardour2/branches/3.0@13635 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 99b27d75d65edd496094378948c433a9fefa7b47..b9b0cdb6a2bbe8b14cb4ffa17b29f129d5e475cb 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -108,6 +108,25 @@ ARDOUR_UI::goto_editor_window ()
 void
 ARDOUR_UI::goto_mixer_window ()
 {
+       if (!editor) {
+               return;
+       }
+
+       Glib::RefPtr<Gdk::Window> win = editor->get_window ();
+       Glib::RefPtr<Gdk::Screen> screen;
+       
+       if (win) {
+               screen = win->get_screen();
+       } else {
+               screen = Gdk::Screen::get_default();
+       }
+       
+       if (screen && screen->get_height() < 700) {
+               Gtk::MessageDialog msg (_("This screen is not tall enough to display the mixer window"));
+               msg.run ();
+               return;
+       }
+
        mixer->show_window ();
        mixer->present ();
        flush_pending ();

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index b7eb05affcf832adc024d617a6fc55785adb4477..f63e396ba73738dd1893282db97992d29e6bf2f5 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -80,7 +80,7 @@ Editor::show_editor_mixer (bool yn)
                Glib::RefPtr<Gdk::Window> win = get_window ();
                Glib::RefPtr<Gdk::Screen> screen;
                
-               if (get_window()) {
+               if (win) {
                         screen = win->get_screen();
                } else {
                        screen = Gdk::Screen::get_default();