Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 11:25:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for "Keyboard sometimes stops working after Ctrl/+ or Ctrl/-" (#794)

Browse Source
This commit is contained in:
ManoloFLTK
2023-10-19 08:27:46 +02:00
parent 56af338cfd
commit c1d9376934
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Screen_Driver.cxx
+11 -3
View File
@@ -447,6 +447,9 @@ void Fl_Screen_Driver::transient_scale_display(float f, int nscreen)
data->tracker = (widget ? new Fl_Widget_Tracker(widget) : NULL); data->tracker = (widget ? new Fl_Widget_Tracker(widget) : NULL);
win->show(); win->show();
Fl::add_timeout(1, (Fl_Timeout_Handler)del_transient_window, data); // delete after 1 sec Fl::add_timeout(1, (Fl_Timeout_Handler)del_transient_window, data); // delete after 1 sec
win->wait_for_expose();
Fl::flush();
Fl::check();
} }
// respond to Ctrl-'+' and Ctrl-'-' and Ctrl-'0' (Ctrl-'=' is same as Ctrl-'+') by rescaling all windows // respond to Ctrl-'+' and Ctrl-'-' and Ctrl-'0' (Ctrl-'=' is same as Ctrl-'+') by rescaling all windows
@@ -496,9 +499,14 @@ int Fl_Screen_Driver::scale_handler(int event)
f = scaling_values[i]; f = scaling_values[i];
} }
if (f == old_f) return 1; if (f == old_f) return 1;
screen_dr->rescale_all_windows_from_screen(screen, f*initial_scale); static bool in_use = false;
Fl_Screen_Driver::transient_scale_display(f, screen); if (!in_use) { // avoid recursive use (see issue #794)
Fl::handle(FL_ZOOM_EVENT, NULL); in_use = true;
screen_dr->rescale_all_windows_from_screen(screen, f * initial_scale);
Fl_Screen_Driver::transient_scale_display(f, screen);
Fl::handle(FL_ZOOM_EVENT, NULL);
in_use = false;
}
return 1; return 1;
} }
return 0; return 0;