mirror of
https://github.com/fltk/fltk.git
synced 2026-05-30 04:55:29 +08:00
Fix "Focus event lost if opening window on macOS" (#1300)
This commit is contained in:
+1
-1
@@ -1143,6 +1143,7 @@ static void cocoaMouseHandler(NSEvent *theEvent)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case NSEventTypeMouseEntered :
|
case NSEventTypeMouseEntered :
|
||||||
|
if ([theEvent window]) update_e_xy_and_e_xy_root([theEvent window]);
|
||||||
Fl::handle(FL_ENTER, window);
|
Fl::handle(FL_ENTER, window);
|
||||||
break;
|
break;
|
||||||
case NSEventTypeMouseExited :
|
case NSEventTypeMouseExited :
|
||||||
@@ -1465,7 +1466,6 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
|
|||||||
Fl_Window *window = [nsw getFl_Window];
|
Fl_Window *window = [nsw getFl_Window];
|
||||||
Fl::first_window(window);
|
Fl::first_window(window);
|
||||||
if (!window->parent()) [nsw orderFront:nil];
|
if (!window->parent()) [nsw orderFront:nil];
|
||||||
update_e_xy_and_e_xy_root(nsw);
|
|
||||||
if (fl_sys_menu_bar && Fl_MacOS_Sys_Menu_Bar_Driver::window_menu_style()) {
|
if (fl_sys_menu_bar && Fl_MacOS_Sys_Menu_Bar_Driver::window_menu_style()) {
|
||||||
// select the corresponding Window menu item
|
// select the corresponding Window menu item
|
||||||
int index = Fl_MacOS_Sys_Menu_Bar_Driver::driver()->first_window_menu_item;
|
int index = Fl_MacOS_Sys_Menu_Bar_Driver::driver()->first_window_menu_item;
|
||||||
|
|||||||
Reference in New Issue
Block a user