Fix font sizing in the big clock.

[ardour.git] / gtk2_ardour / utils.cc

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index e96137ee2c41306cb9959f7b8bdde4ff7608cc55..f9cc0739c69336ec20abebfa15f12b7bce6324fb 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -684,7 +684,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
 
                uint32_t fakekey = ev->keyval;
 
-               if (possibly_translate_keyval_to_make_legal_accelerator (fakekey)) {
+               if (Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (fakekey)) {
                        if (allow_activating && gtk_accel_groups_activate(G_OBJECT(win), fakekey, GdkModifierType(ev->state))) {
                                return true;
                        }
@@ -916,88 +916,6 @@ reset_dpi ()
        DPIReset();//Emit Signal
 }
 
-bool
-possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval)
-{
-       int fakekey = GDK_VoidSymbol;
-
-       switch (keyval) {
-       case GDK_Tab:
-       case GDK_ISO_Left_Tab:
-               fakekey = GDK_nabla;
-               break;
-
-       case GDK_Up:
-               fakekey = GDK_uparrow;
-               break;
-
-       case GDK_Down:
-               fakekey = GDK_downarrow;
-               break;
-
-       case GDK_Right:
-               fakekey = GDK_rightarrow;
-               break;
-
-       case GDK_Left:
-               fakekey = GDK_leftarrow;
-               break;
-
-       case GDK_Return:
-               fakekey = GDK_3270_Enter;
-               break;
-
-       case GDK_KP_Enter:
-               fakekey = GDK_F35;
-               break;
-
-       default:
-               break;
-       }
-
-       if (fakekey != GDK_VoidSymbol) {
-               keyval = fakekey;
-               return true;
-       }
-
-       return false;
-}
-
-uint32_t
-possibly_translate_legal_accelerator_to_real_key (uint32_t keyval)
-{
-       switch (keyval) {
-       case GDK_nabla:
-               return GDK_Tab;
-               break;
-
-       case GDK_uparrow:
-               return GDK_Up;
-               break;
-
-       case GDK_downarrow:
-               return GDK_Down;
-               break;
-
-       case GDK_rightarrow:
-               return GDK_Right;
-               break;
-
-       case GDK_leftarrow:
-               return GDK_Left;
-               break;
-
-       case GDK_3270_Enter:
-               return GDK_Return;
-
-       case GDK_F35:
-               return GDK_KP_Enter;
-               break;
-       }
-
-       return keyval;
-}
-
 
 
 inline guint8
@@ -1039,8 +957,8 @@ resize_window_to_proportion_of_monitor (Gtk::Window* window, int max_width, int
        Gdk::Rectangle monitor_rect;
        screen->get_monitor_geometry (0, monitor_rect);
 
-       int const w = std::min (monitor_rect.get_width(), max_width) * 0.8;
-       int const h = std::min (monitor_rect.get_height(), max_height) * 0.8;
+       int const w = std::min (int (monitor_rect.get_width() * 0.8), max_width);
+       int const h = std::min (int (monitor_rect.get_height() * 0.8), max_height);
 
        window->resize (w, h);
 }