Add Fl_Option::OPTION_SHOW_SCALING to fluid's "Global FLTK Settings".

1 files changed, 46 insertions, 5 deletions

diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 7d0300eb1..588b27c9a 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -483,7 +483,8 @@ wArrowFocus->value(opt[Fl::OPTION_ARROW_FOCUS][mode]);
 wShowTooltips->value(opt[Fl::OPTION_SHOW_TOOLTIPS][mode]);
 wDNDText->value(opt[Fl::OPTION_DND_TEXT][mode]);
 wGTKText->value(opt[Fl::OPTION_FNFC_USES_GTK][mode]);
-wPrintGTKText->value(opt[Fl::OPTION_PRINTER_USES_GTK][mode]);} {}
+wPrintGTKText->value(opt[Fl::OPTION_PRINTER_USES_GTK][mode]);
+wShowZoomFactor->value(opt[Fl::OPTION_SHOW_SCALING][mode]);} {}
 }
 
 Function {readPrefs()} {
@@ -499,6 +500,7 @@ Function {readPrefs()} {
   opt_prefs.get("ShowTooltips", opt[Fl::OPTION_SHOW_TOOLTIPS][1], 2);
   opt_prefs.get("FNFCUsesGTK", opt[Fl::OPTION_FNFC_USES_GTK ][1], 2);
   opt_prefs.get("PrintUsesGTK", opt[Fl::OPTION_PRINTER_USES_GTK ][1], 2);
+  opt_prefs.get("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING ][1], 2);
 }
 {
   Fl_Preferences prefs(Fl_Preferences::USER, "fltk.org", "fltk");
@@ -509,6 +511,7 @@ Function {readPrefs()} {
   opt_prefs.get("ShowTooltips", opt[Fl::OPTION_SHOW_TOOLTIPS][0], 2);
   opt_prefs.get("FNFCUsesGTK", opt[Fl::OPTION_FNFC_USES_GTK ][0], 2);
   opt_prefs.get("PrintUsesGTK", opt[Fl::OPTION_PRINTER_USES_GTK ][0], 2);
+  opt_prefs.get("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING ][0], 2);
 }
 refreshUI();} {}
 }
@@ -532,6 +535,8 @@ Function {writePrefs()} {
   else opt_prefs.set("FNFCUsesGTK", opt[Fl::OPTION_FNFC_USES_GTK][1]);
   if (opt[Fl::OPTION_PRINTER_USES_GTK][1]==2) opt_prefs.deleteEntry("PrintUsesGTK");
   else opt_prefs.set("PrintUsesGTK", opt[Fl::OPTION_PRINTER_USES_GTK][1]);
+  if (opt[Fl::OPTION_SHOW_SCALING][1]==2) opt_prefs.deleteEntry("ShowZoomFactor");
+  else opt_prefs.set("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING][1]);
 }
 {
   Fl_Preferences prefs(Fl_Preferences::USER, "fltk.org", "fltk");
@@ -548,6 +553,8 @@ Function {writePrefs()} {
   else opt_prefs.set("FNFCUsesGTK", opt[Fl::OPTION_FNFC_USES_GTK][0]);
   if (opt[Fl::OPTION_PRINTER_USES_GTK][0]==2) opt_prefs.deleteEntry("PrintUsesGTK");
   else opt_prefs.set("PrintUsesGTK", opt[Fl::OPTION_PRINTER_USES_GTK][0]);
+  if (opt[Fl::OPTION_SHOW_SCALING][0]==2) opt_prefs.deleteEntry("ShowZoomFactor");
+  else opt_prefs.set("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING][0]);
 }} {}
 }
 
@@ -570,7 +577,7 @@ global_settings_window->show();} {}
 Function {make_global_settings_window()} {} {
   Fl_Window global_settings_window {
     label {FLTK Preferences} open
-    xywh {715 96 400 455} type Double color 50 hide
+    xywh {715 96 400 531} type Double color 50 hide
   } {
     Fl_Group {} {
       label {Keyboard Focus Options} open
@@ -757,9 +764,43 @@ Default is on.} xywh {245 366 100 25} down_box BORDER_BOX
         }
       }
     }
+    
+        Fl_Group {} {
+      label {Scaling Factor Options} open
+      xywh {10 421 380 66} box GTK_DOWN_BOX labelfont 2 align 21
+    } {
+      Fl_Choice wShowZoomFactor {
+        label {Transiently show scaling factor:}
+        callback {int mode = wUserOrSystem->value();
+opt[Fl::OPTION_SHOW_SCALING ][mode] = wShowZoomFactor->value();} open
+        tooltip {OPTION_SHOW_SCALING
+
+If 'Transiently show scaling factor' is enabled, the library shows in a transient yellow window the display
+scaling factor value when it is changed. If disabled, no such transient window is used.
+
+Default is on.} xywh {245 442 100 25} down_box BORDER_BOX
+      } {
+        MenuItem {} {
+          label off
+          user_data 0 user_data_type long selected
+          xywh {30 30 31 20}
+        }
+        MenuItem {} {
+          label on
+          user_data 1 user_data_type long
+          xywh {30 30 31 20} divider
+        }
+        MenuItem {} {
+          label default
+          user_data 2 user_data_type long
+          xywh {30 30 31 20}
+        }
+      }
+    }
+    
     Fl_Choice wUserOrSystem {
       callback {refreshUI();} open
-      tooltip {Change settings for the current user, or default values for all users of this computer. Individual users can override system options, if they set their options to specific values (not 'default').} xywh {10 420 141 25} down_box BORDER_BOX
+      tooltip {Change settings for the current user, or default values for all users of this computer. Individual users can override system options, if they set their options to specific values (not 'default').} xywh {10 496 141 25} down_box BORDER_BOX
     } {
       MenuItem {} {
         label {User Settings}
@@ -775,13 +816,13 @@ Default is on.} xywh {245 366 100 25} down_box BORDER_BOX
     Fl_Button {} {
       label Cancel
       callback {global_settings_window->hide();}
-      xywh {230 420 75 25}
+      xywh {230 496 75 25}
     }
     Fl_Button {} {
       label OK
       callback {writePrefs();
 global_settings_window->hide();}
-      xywh {315 420 75 25}
+      xywh {315 496 75 25}
     }
   }
   code {readPrefs();