diff options
| author | Alex Samorukov <samm@net-art.cz> | 2020-01-08 14:10:06 +0000 |
|---|---|---|
| committer | Alex Samorukov <samm@net-art.cz> | 2020-01-08 14:10:06 +0000 |
| commit | 7dcb25bd4643a5245ba8375459f6d89eadfc6e01 (patch) | |
| tree | 8f89738af67b01eb15af738df7c07657a561f344 | |
| parent | 0582a4ef1b244656cee64e6078cbf6bbab59d421 (diff) | |
| parent | d131c8d0e7f2ca8390b364a9712936812e6657d7 (diff) | |
| download | gtk+-7dcb25bd4643a5245ba8375459f6d89eadfc6e01.tar.gz | |
Merge branch 'master-eventloop-fix' into 'master'
Move `[NSApplication sharedApplication]` after event loop init to avoid window focus issues (closes #2342).
See merge request GNOME/gtk!1286
| -rw-r--r-- | gdk/quartz/gdkdisplay-quartz.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c index 3420801978..5b4b3c99ed 100644 --- a/gdk/quartz/gdkdisplay-quartz.c +++ b/gdk/quartz/gdkdisplay-quartz.c @@ -55,9 +55,6 @@ _gdk_quartz_display_open (const gchar *display_name) if (_gdk_display != NULL) return NULL; - /* Initialize application */ - [NSApplication sharedApplication]; - _gdk_display = g_object_new (gdk_quartz_display_get_type (), NULL); _gdk_device_manager = _gdk_device_manager_new (_gdk_display); @@ -67,6 +64,8 @@ _gdk_quartz_display_open (const gchar *display_name) _gdk_quartz_events_init (); + /* Initialize application */ + [NSApplication sharedApplication]; #if 0 /* FIXME: Remove the #if 0 when we have these functions */ _gdk_quartz_dnd_init (); |