mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.14.0.158

Browse Source 
Former-commit-id: 4ce645df2aa1979134f14496e1d63b44e5cf33b5
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-07-03 08:18:15 +00:00
parent e747ac1590
commit 9501b3a01c
38 changed files with 95 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
external/bockbuild/packages/gtk+.py vendored
View File

@@ -208,7 +208,12 @@ class GtkPackage (GitHubPackage):
# https://developercommunity.visualstudio.com/content/problem/104471/visual-studio-for-mac-720540-cannot-launch-exc-bre.html
'patches/gtk/update_only_apple_keyboard_layout.patch',
'patches/gtk/gtk-backing-scale-factor.patch'
'patches/gtk/gtk-backing-scale-factor.patch',
'patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch',
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/569768
'patches/gtk/gtk-imquartz-commit-on-focus-out.patch'
])
def prep(self):

13
external/bockbuild/packages/patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch vendored Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 195899b13b..844128e0b2 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -748,7 +748,7 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
if (r.origin.x <= x && r.origin.x + r.size.width >= x &&
r.origin.y <= y && r.origin.y + r.size.height >= y)
{
- NSView* child = find_nsview_at_pos (impl, x - r.origin.x, y - r.origin.y);
+ NSView* child = find_nsview_at_pos (sv, x - r.origin.x, y - r.origin.y);
if (child != NULL)
return child;
else

44
external/bockbuild/packages/patches/gtk/gtk-imquartz-commit-on-focus-out.patch vendored Normal file
View File

@@ -0,0 +1,44 @@
commit 5358d331a5a01fd7d11297b1686293251fd93197
Author: Cody Russell <cody@jhu.edu>
Date: Tue Jun 26 23:01:29 2018 -0500
When focusing out, commit the preedit instead of discarding.
Fixes VSTS #569768
diff --git a/modules/input/imquartz.c b/modules/input/imquartz.c
index c93330f22..7829929ac 100644
--- a/modules/input/imquartz.c
+++ b/modules/input/imquartz.c
@@ -277,6 +277,22 @@ quartz_reset (GtkIMContext *context)
discard_preedit (context);
}
+static void
+quartz_commit (GtkIMContext *context)
+{
+ GtkIMContextQuartz *qc = GTK_IM_CONTEXT_QUARTZ (context);
+ NSView *nsview;
+ GdkWindow *window;
+
+ if (!qc->client_window)
+ return;
+
+ nsview = gdk_quartz_window_get_nsview (qc->client_window);
+ window = (GdkWindow *)[(GdkQuartzView *)nsview gdkWindow];
+
+ output_result (context, window);
+}
+
static void
quartz_set_client_window (GtkIMContext *context, GdkWindow *window)
{
@@ -305,7 +321,7 @@ quartz_focus_out (GtkIMContext *context)
qc->focused = FALSE;
/* Commit any partially built strings or it'll mess up other GTK+ widgets in the window */
- discard_preedit (context);
+ quartz_commit (context);
}
static void