diff options
author | Carl Hetherington <carl@carlh.net> | 2011-02-16 02:12:01 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-02-16 02:12:01 +0000 |
commit | bdc9dc94b8118dd48db6e25d119a07fa606f8a96 (patch) | |
tree | 16ffbcdc0a09d9194c8d502b8466f60ea884a0b9 | |
parent | 813df53d2ff1cc9612f10cdca3432ba8824f516e (diff) |
Come to think of it, those size requests were hack to support a clock in the menu bar, which we gave up on. So remove them.
git-svn-id: svn://localhost/ardour2/branches/3.0@8867 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 03b4764af4..0408253b79 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -715,8 +715,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type); int ambiguous_file (std::string file, std::string path, std::vector<std::string> hits); - - void resize_text_widgets (); }; #endif /* __ardour_gui_h__ */ diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index ee0b9b0930..60f4799306 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -513,9 +513,6 @@ 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"); - resize_text_widgets (); - DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets)); - wall_clock_box.add (wall_clock_label); wall_clock_box.set_name ("WallClock"); wall_clock_label.set_name ("WallClock"); @@ -559,18 +556,6 @@ ARDOUR_UI::build_menu_bar () } void -ARDOUR_UI::resize_text_widgets () -{ - /* Set up some size requests here to stop the menu-bar clock jumping around in full-screen mode */ - - set_size_request_to_display_given_text (wall_clock_label, _("99:99"), 2, 0); - set_size_request_to_display_given_text (disk_space_label, _("9999h:999999m:99999999s"), 2, 0); - set_size_request_to_display_given_text (cpu_load_label, _("DSP: 100.0%"), 2, 0); - set_size_request_to_display_given_text (buffer_load_label, _("Buffers p:100% c:100%"), 2, 0); - set_size_request_to_display_given_text (sample_rate_label, X_("384 kHz / 1000 ms"), 2, 0); -} - -void ARDOUR_UI::use_menubar_as_top_menubar () { Gtk::Widget* widget; |