summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-07-23 08:59:32 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-02-22 15:31:22 -0500
commit914af0f0c8ad34135d34d5351baa473a01388a7a (patch)
tree49c8940ba7e335d92d0c6b19299ae6b68220e0c1
parent0819efe27c7091d3a96e426ed7202e0d6b0974a9 (diff)
move ui_scale static member from ARDOUR_UI to GtkUI
-rw-r--r--libs/gtkmm2ext/gtk_ui.cc3
-rw-r--r--libs/gtkmm2ext/gtkmm2ext/gtk_ui.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index b550b6cf8c..64fef47ca5 100644
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -53,7 +53,8 @@ using namespace Glib;
using namespace PBD;
using std::map;
-UI *UI::theGtkUI = 0;
+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 acddbe7c11..f0f34fb4d8 100644
--- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
@@ -167,6 +167,7 @@ class LIBGTKMM2EXT_API UI : public AbstractUI<UIRequest>
sigc::signal<void> theme_changed;
static bool just_hide_it (GdkEventAny *, Gtk::Window *);
+ static float ui_scale;
protected:
virtual void handle_fatal (const char *);