Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -0,0 +1,36 @@
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 35450a0c5..b4973d199 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -461,7 +461,14 @@ _gdk_windowing_before_process_all_updates (void)
{
in_process_all_updates = TRUE;
- NSDisableScreenUpdates ();
+ if (gdk_quartz_osx_version () >= GDK_OSX_EL_CAPITAN)
+ {
+ [NSAnimationContext endGrouping];
+ }
+ else
+ {
+ NSDisableScreenUpdates ();
+ }
}
void
@@ -491,7 +498,14 @@ _gdk_windowing_after_process_all_updates (void)
in_process_all_updates = FALSE;
- NSEnableScreenUpdates ();
+ if (gdk_quartz_osx_version() >= GDK_OSX_EL_CAPITAN)
+ {
+ [NSAnimationContext beginGrouping];
+ }
+ else
+ {
+ NSEnableScreenUpdates ();
+ }
}
static void