fix background of ArdourButtons with no Body

[ardour.git] / gtk2_ardour / big_clock_window.cc

diff --git a/gtk2_ardour/big_clock_window.cc b/gtk2_ardour/big_clock_window.cc
index 033e87f238d88661ab5d5b1c10722b5ae0729c1a..56fe34feac463433c1069285217eb8e313c98ecb 100644 (file)
--- a/gtk2_ardour/big_clock_window.cc
+++ b/gtk2_ardour/big_clock_window.cc
@@ -33,11 +33,9 @@ using std::min;
 using std::string;
 using namespace ARDOUR_UI_UTILS;
 
-BigClockWindow::BigClockWindow (AudioClock& c) 
+BigClockWindow::BigClockWindow (AudioClock& c)
        : ArdourWindow (_("Big Clock"))
        , clock (c)
-       , original_height (0)
-       , original_width (0)
 {
        ARDOUR_UI::Clock.connect (sigc::mem_fun (clock, &AudioClock::set));
 
@@ -47,14 +45,17 @@ BigClockWindow::BigClockWindow (AudioClock& c)
        set_border_width (0);
        add (clock);
        clock.show_all ();
+
+       clock.size_request (default_size);
+
+       clock.signal_size_allocate().connect (sigc::mem_fun (*this, &BigClockWindow::clock_size_reallocated));
 }
 
 void
 BigClockWindow::on_unmap ()
 {
        ArdourWindow::on_unmap ();
-
-       PublicEditor::instance().reset_focus ();
+       PublicEditor::instance().reset_focus (&clock);
 }
 
 bool
@@ -67,32 +68,26 @@ void
 BigClockWindow::on_realize ()
 {
        ArdourWindow::on_realize ();
-       get_window()->set_decorations (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH);
+       /* (try to) ensure that resizing is possible and the window can be moved (and closed) */
+       get_window()->set_decorations (Gdk::DECOR_BORDER | Gdk::DECOR_RESIZEH | Gdk::DECOR_TITLE | Gdk::DECOR_MENU);
+
+       /* try to force a fixed aspect ratio so that we don't distort the font */
+       float aspect = default_size.width/(float)default_size.height;
+       Gdk::Geometry geom;
+
+       geom.min_aspect = aspect;
+       geom.max_aspect = aspect;
+       geom.min_width = -1; /* use requisition */
+       geom.min_height = -1; /* use requisition */
 
-       int x, y, d;
-       get_window()->get_geometry (x, y, original_width, original_height, d);
+       get_window()->set_geometry_hints (geom, Gdk::WindowHints (Gdk::HINT_ASPECT|Gdk::HINT_MIN_SIZE));
 }
 
 void
-BigClockWindow::on_size_allocate (Gtk::Allocation& alloc)
+BigClockWindow::clock_size_reallocated (Gtk::Allocation& alloc)
 {
-       ArdourWindow::on_size_allocate (alloc);
-
-       if (original_width) {
-               clock.set_scale ((double) alloc.get_width() / original_width,
-                                (double)  alloc.get_height() / original_height);
-
-
-
-               std::cerr << "Rescale to "
-                         << (double) alloc.get_width() / original_width
-                         << " x " 
-                         << (double)  alloc.get_height() / original_height
-                         << " using " << alloc.get_width() << " vs. " << original_width
-                         << " and " << alloc.get_height() << " vs. " << original_height
-                         << std::endl;
-
-       }
+       clock.set_scale ((double) alloc.get_width() / default_size.width,
+                        (double)  alloc.get_height() / default_size.height);
 }