dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: OSX - activate GIMP window when tests are running 

If window is not focused gimp_test_utils_synthesize_key_event would
fail.

(cherry picked from commit 63e86da6f3)
This commit is contained in:
Oleksii Samorukov 2018-11-23 23:15:25 +01:00
parent 7921b24a89
commit 28d376ae3e
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Makefile.am
View File

@ -1,5 +1,11 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
if PLATFORM_OSX
xobjective_c = "-xobjective-c"
xobjective_cxx = "-xobjective-c++"
xnone = "-xnone"
endif
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
@ -125,6 +131,7 @@ AM_CPPFLAGS = \
$(LCMS_CFLAGS) \ $(LCMS_CFLAGS) \
$(GEXIV2_CFLAGS) \ $(GEXIV2_CFLAGS) \
$(psapi_cflags) \ $(psapi_cflags) \
$(xobjective_c) \
-I$(includedir) \ -I$(includedir) \
-I$(builddir)/gui -I$(builddir)/gui

15
app/tests.c
View File

@ -42,6 +42,10 @@
#include "gimp-log.h" #include "gimp-log.h"
#include "tests.h" #include "tests.h"
#ifdef GDK_WINDOWING_QUARTZ
#include <Cocoa/Cocoa.h>
#endif
static void static void
gimp_status_func_dummy (const gchar *text1, gimp_status_func_dummy (const gchar *text1,
@ -92,6 +96,14 @@ gimp_init_icon_theme_for_testing (void)
return; return;
} }
#ifdef GDK_WINDOWING_QUARTZ
static void
gimp_osx_focus_window (void)
{
[NSApp activateIgnoringOtherApps:YES];
}
#endif
static Gimp * static Gimp *
gimp_init_for_gui_testing_internal (gboolean show_gui, gimp_init_for_gui_testing_internal (gboolean show_gui,
GFile *gimprc) GFile *gimprc)
@ -129,6 +141,9 @@ gimp_init_for_gui_testing_internal (gboolean show_gui,
gimp_init_icon_theme_for_testing (); gimp_init_icon_theme_for_testing ();
gimp_initialize (gimp, gimp_status_func_dummy); gimp_initialize (gimp, gimp_status_func_dummy);
gimp_restore (gimp, gimp_status_func_dummy, NULL); gimp_restore (gimp, gimp_status_func_dummy, NULL);
#ifdef GDK_WINDOWING_QUARTZ
g_idle_add ((GSourceFunc) gimp_osx_focus_window, NULL);
#endif
return gimp; return gimp;
} }