From 401eefec1c6b8802f562954399956a11774963f2 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 5 May 2017 13:59:48 +0200 Subject: [PATCH] remove cruft (unused UI::ui_scale) --- libs/gtkmm2ext/cairo_icon.cc | 5 ++--- libs/gtkmm2ext/gtk_ui.cc | 1 - libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/gtkmm2ext/cairo_icon.cc b/libs/gtkmm2ext/cairo_icon.cc index 11b37264c2..0191d39582 100644 --- a/libs/gtkmm2ext/cairo_icon.cc +++ b/libs/gtkmm2ext/cairo_icon.cc @@ -48,9 +48,8 @@ CairoIcon::set_fg (uint32_t color) void CairoIcon::render (cairo_t* cr , cairo_rectangle_t* area) { - const double scale = UI::instance()->ui_scale; - int width = get_width() * scale; - int height = get_height () * scale; + int width = get_width(); + int height = get_height (); ArdourIcon::render (cr, icon_type, width, height, Off, fg); } diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 3ec7817edc..c2210bba93 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -55,7 +55,6 @@ using namespace PBD; using std::map; UI* UI::theGtkUI = 0; -float UI::ui_scale = 1.0; BaseUI::RequestType Gtkmm2ext::NullMessage = BaseUI::new_request_type(); BaseUI::RequestType Gtkmm2ext::ErrorMessage = BaseUI::new_request_type(); diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index 6a66d0f302..1ee972c5a5 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -166,7 +166,6 @@ public: sigc::signal theme_changed; static bool just_hide_it (GdkEventAny *, Gtk::Window *); - static float ui_scale; Gtkmm2ext::Bindings* global_bindings; -- 2.30.2