diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-03-28 16:27:43 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-03-28 16:27:43 +0000 |
| commit | ef0f00d357c8f29063b3aa04507ba7cc3677f30d (patch) | |
| tree | 94a664d89950a37326ccc85650568a665377948a | |
| parent | 458d0636436b5f25e444dc285007dceac296c2ee (diff) | |
Add more display scaling factors for testing.
These scaling factors can be activated by defining the preprocessor
macro TEST_SCALING.
Note: this feature may be changed or removed in the future.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12812 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_Screen_Driver.cxx | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx index dea18a942..971ce423e 100644 --- a/src/Fl_Screen_Driver.cxx +++ b/src/Fl_Screen_Driver.cxx @@ -395,7 +395,24 @@ int Fl_Screen_Driver::scale_handler(int event) int screen = wid->top_window()->driver()->screen_num(); Fl_Screen_Driver *screen_dr = Fl::screen_driver(); static float initial_scale = screen_dr->scale(screen); - static float scaling_values[] = {0.5, 2.f/3, 0.8, 0.9, 1, 1.1, 1.2, 4.f/3, 1.5, 1.7, 2, 2.4, 3}; +#if defined(TEST_SCALING) + // test scaling factors: lots of values from 0.3 to 8.0 + static float scaling_values[] = { + 0.30000, 0.33661, 0.37768, 0.42376, 0.47547, + 0.50000, 0.53348, 0.59858, 0.67162, 0.75357, + 0.84551, 0.94868, 1.00000, 1.06444, 1.19432, + 1.34005, 1.50000, 1.68702, 1.89287, 2.00000, + 2.12384, 7.0f/3, 2.38298, 8.0f/3, 3.00000, + 10.0f/3, 3.75000, 4.00000, 13.0f/3, 14.0f/3, + 5.00000, 16.0f/3, 17.0f/3, 6.00000, 7.00000, + 8.00000}; +#else + // scaling factors for the standard GUI + static float scaling_values[] = { + 0.5, 2.f/3, 0.8, 0.9, 1.0, + 1.1, 1.2, 4.f/3, 1.5, 1.7, + 2.0, 2.4, 3.0}; +#endif float f, old_f = screen_dr->scale(screen)/initial_scale; if (key == '0' || key == 0xE0) f = 1; else { |