#include <string>
#include <vector>
+#include "gtkmm2ext/utils.h"
+
#include "ardour_ui.h"
#include "audio_clock.h"
#include "big_clock_window.h"
#include "public_editor.h"
#include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
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));
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 ();
+ ARDOUR_UI::instance()->reset_focus (this);
}
bool
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);
- int x, y, d;
- get_window()->get_geometry (x, y, original_width, original_height, d);
+ /* 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 */
+
+ 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);
- }
+ clock.set_scale ((double) alloc.get_width() / default_size.width,
+ (double) alloc.get_height() / default_size.height);
}