Imported Upstream version 5.20.1.3
Former-commit-id: c0dbb88f7549c374316c95af3cf6b4a8c7d66bfe
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
6008c1b5ce
commit
b501216e0b
@ -1 +1 @@
|
||||
17ee62937b460cba39bf26a858c29c2c54457ab7
|
||||
94bc7d21560c6d7059519c3cb59ddff9d187b0c8
|
||||
@ -1 +1 @@
|
||||
cad070b951efa98a606ab02c265f6d0b8a77b64f
|
||||
c110d06a95e16d5496281e8499d680b7692c0840
|
||||
18
external/bockbuild/packages/gtk+.py
vendored
18
external/bockbuild/packages/gtk+.py
vendored
@ -212,14 +212,18 @@ class GtkPackage (GitHubPackage):
|
||||
|
||||
#'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',
|
||||
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/569768
|
||||
'patches/gtk/gtk-imquartz-commit-on-focus-out.patch',
|
||||
|
||||
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/737323
|
||||
'patches/gtk/gtk-nsview-subview-focus-fixes.patch',
|
||||
'patches/gtk/gtk-nsview-focus-tabbing.patch',
|
||||
'patches/gtk/popup-combo-box-with-arrows.patch',
|
||||
'patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch'
|
||||
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/737323
|
||||
'patches/gtk/gtk-nsview-subview-focus-fixes.patch',
|
||||
'patches/gtk/gtk-nsview-focus-tabbing.patch',
|
||||
'patches/gtk/popup-combo-box-with-arrows.patch',
|
||||
'patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch',
|
||||
'patches/gtk/0077-fix-nsview-embedding-mouse-move-event-when-popup-window-appears.patch',
|
||||
|
||||
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/821841
|
||||
'patches/gtk/nsview-embedding-skip-hidden-subviews.patch',
|
||||
])
|
||||
|
||||
def prep(self):
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
|
||||
index 195899b13..3eecdde42 100644
|
||||
--- a/gdk/quartz/gdkevents-quartz.c
|
||||
+++ b/gdk/quartz/gdkevents-quartz.c
|
||||
@@ -932,7 +932,7 @@ find_window_for_ns_event (NSEvent *nsevent,
|
||||
toplevel_private = (GdkWindowObject *)toplevel;
|
||||
toplevel_impl = (GdkWindowImplQuartz *)toplevel_private->impl;
|
||||
|
||||
- subview = find_nsview_at_pos (toplevel_impl, *x, *y);
|
||||
+ subview = find_nsview_at_pos (toplevel_impl, x_tmp, y_tmp);
|
||||
if (subview != NULL && ![subview isKindOfClass:[GdkQuartzView class]]) {
|
||||
g_signal_emit_by_name (toplevel, "native-child-event",
|
||||
subview, nsevent);
|
||||
26
external/bockbuild/packages/patches/gtk/nsview-embedding-skip-hidden-subviews.patch
vendored
Normal file
26
external/bockbuild/packages/patches/gtk/nsview-embedding-skip-hidden-subviews.patch
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
From cb62d4a99f228f51ee420f289f741dbb4ecea57b Mon Sep 17 00:00:00 2001
|
||||
From: Vsevolod Kukol <sevoku@microsoft.com>
|
||||
Date: Mon, 18 Mar 2019 16:15:54 +0100
|
||||
Subject: [PATCH] Skip hidden subviews when searching for a child event target
|
||||
|
||||
---
|
||||
gdk/quartz/gdkevents-quartz.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
|
||||
index b5016e1de9..8101e366c8 100644
|
||||
--- a/gdk/quartz/gdkevents-quartz.c
|
||||
+++ b/gdk/quartz/gdkevents-quartz.c
|
||||
@@ -724,7 +724,8 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
|
||||
if (sv == impl->layer_view)
|
||||
continue;
|
||||
|
||||
- if (r.origin.x <= x && r.origin.x + r.size.width >= x &&
|
||||
+ if (![sv isHidden] &&
|
||||
+ 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);
|
||||
--
|
||||
2.17.1 (Apple Git-112)
|
||||
|
||||
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.1.0";
|
||||
public const string MonoVersion = "5.20.1.3";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -41,7 +41,8 @@ namespace System.ServiceModel.Channels
|
||||
{
|
||||
HttpChannelFactory<IRequestChannel> source;
|
||||
|
||||
List<WebRequest> web_requests = new List<WebRequest> ();
|
||||
object locker = new object();
|
||||
List<WebRequest> web_requests = new List<WebRequest> (); //synced by locker
|
||||
|
||||
// Constructor
|
||||
|
||||
@ -86,7 +87,12 @@ namespace System.ServiceModel.Channels
|
||||
}
|
||||
|
||||
var web_request = (HttpWebRequest) HttpWebRequest.Create (destination);
|
||||
web_requests.Add (web_request);
|
||||
|
||||
lock (locker)
|
||||
{
|
||||
web_requests.Add (web_request);
|
||||
}
|
||||
|
||||
result.WebRequest = web_request;
|
||||
web_request.Method = "POST";
|
||||
web_request.ContentType = Encoder.ContentType;
|
||||
@ -350,9 +356,20 @@ namespace System.ServiceModel.Channels
|
||||
|
||||
protected override void OnAbort ()
|
||||
{
|
||||
foreach (var web_request in web_requests.ToArray ())
|
||||
WebRequest[] current_web_requests;
|
||||
|
||||
lock (locker)
|
||||
{
|
||||
current_web_requests = web_requests.ToArray();
|
||||
}
|
||||
|
||||
foreach (var web_request in current_web_requests)
|
||||
web_request.Abort ();
|
||||
web_requests.Clear ();
|
||||
|
||||
lock(locker)
|
||||
{
|
||||
web_requests.Clear ();
|
||||
}
|
||||
}
|
||||
|
||||
// Close
|
||||
@ -497,7 +514,10 @@ namespace System.ServiceModel.Channels
|
||||
|
||||
void Cleanup ()
|
||||
{
|
||||
owner.web_requests.Remove (WebRequest);
|
||||
lock (owner.locker)
|
||||
{
|
||||
owner.web_requests.Remove (WebRequest);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
df5a5fc92d7905ebf7afbf917ca6f1122e507f60
|
||||
ae45d263adda87b3d33397c470a2fd1f4755187d
|
||||
@ -1 +1 @@
|
||||
0687a5d2f6021f1362f95c4a9c49b42ff6f4a9c6
|
||||
60a6339b6c14d7868129f347b15f3dd086ae01b5
|
||||
@ -1 +1 @@
|
||||
e722d044d5e351ccfde65c270f8bcf11cb8dd1b1
|
||||
369ff3864f283c17c1c752eb0f0da156ad05617f
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
63967ebdb25eb87385c0ddd1bb0e7d613e667454
|
||||
180c38a8bdc36a60626e44ed7920cc1e0e25d9c9
|
||||
@ -1 +1 @@
|
||||
38c6703f1e110a77aec611606f421524a10aaea0
|
||||
ad1a8440cd8a7b65154e2143b28502f22ceedf59
|
||||
@ -1 +1 @@
|
||||
6e424b13b6a523109871a5892de9c92309e8a794
|
||||
c3a7f19271ebc7b4a9bc655e58c899da6d3b3669
|
||||
@ -1 +1 @@
|
||||
b732d0e8f434ee2be69e269693879a25d0ea8869
|
||||
dc42b64cdc4b9ae2ca91d631e08778f7e9eb6a8d
|
||||
@ -1 +1 @@
|
||||
df5a5fc92d7905ebf7afbf917ca6f1122e507f60
|
||||
ae45d263adda87b3d33397c470a2fd1f4755187d
|
||||
@ -1 +1 @@
|
||||
0687a5d2f6021f1362f95c4a9c49b42ff6f4a9c6
|
||||
60a6339b6c14d7868129f347b15f3dd086ae01b5
|
||||
@ -1 +1 @@
|
||||
e722d044d5e351ccfde65c270f8bcf11cb8dd1b1
|
||||
369ff3864f283c17c1c752eb0f0da156ad05617f
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
63967ebdb25eb87385c0ddd1bb0e7d613e667454
|
||||
180c38a8bdc36a60626e44ed7920cc1e0e25d9c9
|
||||
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