Merge branch 'upstream'
Former-commit-id: 18fd42587697d4be6fc47b8f07a50c9cadb08b98
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
9e3d21607c
@ -1 +1 @@
|
||||
e94257dd53848925d89adc796d930eb14b964280
|
||||
3d370aee6ff558d1db9495739a11b0fbdd5c3be3
|
||||
@ -1 +1 @@
|
||||
e3c358a667ccdb5f92cd6fd71f750b3abb8359c5
|
||||
590adfbc18ed4d0b5d5b6433347692980d68352f
|
||||
7
external/bockbuild/packages/gtk+.py
vendored
7
external/bockbuild/packages/gtk+.py
vendored
@ -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
13
external/bockbuild/packages/patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch
vendored
Normal 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
44
external/bockbuild/packages/patches/gtk/gtk-imquartz-commit-on-focus-out.patch
vendored
Normal 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
|
||||
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.14.0.156";
|
||||
public const string MonoVersion = "5.14.0.158";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6
|
||||
78920717669553c991639cd8ca1188215eaa85af
|
||||
@ -1 +1 @@
|
||||
7cd4ce8794c209e26f59d0c354d93fb9ae1f95db
|
||||
66936f786b470766acbfa39582d2a6c9ce011046
|
||||
@ -1 +1 @@
|
||||
40ab52f347643403188c38498f42091ef9f00d9c
|
||||
66f20a4c99d0395431836ac79442c69b728ace7a
|
||||
@ -1 +1 @@
|
||||
14839a10498c41b5b2bc637ff264e816bd2d87d0
|
||||
0d28f3fa635006a8aebd64886b9980cd2b077077
|
||||
@ -1 +1 @@
|
||||
79b791d700de0970735b209e0d091d1a21787896
|
||||
722e1a947458dbff3be028eccb95a69433773c95
|
||||
@ -1 +1 @@
|
||||
03f9e0b46c10b5712398a929c279cd9654a0393d
|
||||
04915ee16c1fcbc265345e14dee015a5e9a0c74b
|
||||
@ -1 +1 @@
|
||||
9a030f23563302ff603ffee74a0dd6f89a4f8b15
|
||||
12d08661907184a324a81714dfdc065d412b7229
|
||||
@ -1 +1 @@
|
||||
6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6
|
||||
78920717669553c991639cd8ca1188215eaa85af
|
||||
@ -1 +1 @@
|
||||
7cd4ce8794c209e26f59d0c354d93fb9ae1f95db
|
||||
66936f786b470766acbfa39582d2a6c9ce011046
|
||||
@ -1 +1 @@
|
||||
40ab52f347643403188c38498f42091ef9f00d9c
|
||||
66f20a4c99d0395431836ac79442c69b728ace7a
|
||||
@ -1 +1 @@
|
||||
14839a10498c41b5b2bc637ff264e816bd2d87d0
|
||||
0d28f3fa635006a8aebd64886b9980cd2b077077
|
||||
@ -1 +1 @@
|
||||
79b791d700de0970735b209e0d091d1a21787896
|
||||
722e1a947458dbff3be028eccb95a69433773c95
|
||||
@ -1 +1 @@
|
||||
03f9e0b46c10b5712398a929c279cd9654a0393d
|
||||
04915ee16c1fcbc265345e14dee015a5e9a0c74b
|
||||
@ -1 +1 @@
|
||||
9a030f23563302ff603ffee74a0dd6f89a4f8b15
|
||||
12d08661907184a324a81714dfdc065d412b7229
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user