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

Restore emojis support under recent macOS versions (#1360)
Build and Test / build-linux (push) Has been cancelled
Details
Build and Test / build-wayland (push) Has been cancelled
Details
Build and Test / build-macos (push) Has been cancelled
Details
Build and Test / build-windows (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ManoloFLTK
2026-01-12 11:21:48 +01:00
parent afbdbb25b9
commit 69669256d4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+5
View File
@@ -98,6 +98,8 @@ static BOOL through_drawRect = NO;
static BOOL through_Fl_X_flush = NO; static BOOL through_Fl_X_flush = NO;
static BOOL views_use_CA = NO; // YES means views are layer-backed, as on macOS 10.14 when linked with SDK 10.14 static BOOL views_use_CA = NO; // YES means views are layer-backed, as on macOS 10.14 when linked with SDK 10.14
static int im_enabled = -1; static int im_enabled = -1;
static Fl_Widget *previous_focus = NULL; // restore lost focus when character palette window appears
// OS version-dependent pasteboard type names. // OS version-dependent pasteboard type names.
// Some, but not all, versions of the 10.6 SDK for PPC lack the 3 symbols below (PR #761) // Some, but not all, versions of the 10.6 SDK for PPC lack the 3 symbols below (PR #761)
#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6) || defined(__POWERPC__) #if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6) || defined(__POWERPC__)
@@ -1488,6 +1490,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
[nsw setLevel:NSNormalWindowLevel]; [nsw setLevel:NSNormalWindowLevel];
fixup_window_levels(); fixup_window_levels();
} }
previous_focus = Fl::focus();
Fl::handle( FL_UNFOCUS, window); Fl::handle( FL_UNFOCUS, window);
fl_unlock_function(); fl_unlock_function();
} }
@@ -2940,7 +2943,9 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
// insertText sent during handleEvent of a key without text cannot be processed in a single FL_KEYBOARD event. // insertText sent during handleEvent of a key without text cannot be processed in a single FL_KEYBOARD event.
// Occurs with deadkey followed by non-text key // Occurs with deadkey followed by non-text key
if (!in_key_event || !has_text_key) { if (!in_key_event || !has_text_key) {
if (palette && !Fl::focus()) Fl::focus(previous_focus);
Fl::handle(FL_KEYBOARD, target); Fl::handle(FL_KEYBOARD, target);
if (palette) previous_focus = NULL;
Fl::e_length = 0; Fl::e_length = 0;
} }
else need_handle = YES; else need_handle = YES;