merge with dev

2019-04-16 10:59:38 +02:00
parent 55d96fca51 7d33fc40cd
commit c9af6109ab
12 changed files with 59 additions and 34 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -212,6 +212,7 @@ public:
    int fontSize;                // RT's main font size (units: pt)
    Glib::ustring CPFontFamily;  // ColorPicker font family
    int CPFontSize;              // ColorPicker font size (units: pt)
+    bool pseudoHiDPISupport;
    bool fbOnlyRaw;
    bool fbShowDateTime;
    bool fbShowBasicExif;