Merge branch 'upstream'

Former-commit-id: a325998250da67333b0469db03a54f74ef2e67fe
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-02-21 08:37:48 +00:00
commit eb3db2f1e1
47 changed files with 79 additions and 39 deletions

View File

@ -1 +1 @@
8b48627b7bb555f063c3263fc4eb2f11597e3729
53ecca0a916d5199c18b953531f379fbf197d4b6

View File

@ -1 +1 @@
37bdd1e7ff88dbc3ff4aaedf2df82bf2aeae3813
7b90edbc24c557975585b51e6d60bb43a5bf0bbb

View File

@ -217,7 +217,8 @@ class GtkPackage (GitHubPackage):
# 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/gtk-nsview-focus-tabbing.patch',
'patches/gtk/popup-combo-box-with-arrows.patch'
])
def prep(self):

View File

@ -0,0 +1,39 @@
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index bd83a1e11..417799535 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -651,18 +651,19 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
/* key bindings */
binding_set = gtk_binding_set_by_class (widget_class);
- gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_MOD1_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
"popup", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, GDK_MOD1_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
"popup", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_MOD1_MASK,
- "popdown", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, GDK_MOD1_MASK,
- "popdown", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
+ "popup", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
+ "popup", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
"popdown", 0);
+#if 0
gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP);
@@ -700,7 +701,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_END);
-
+#endif
/* properties */
g_object_class_override_property (object_class,
PROP_EDITING_CANCELED,

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.20.0.217";
public const string MonoVersion = "5.20.0.218";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
31a417e6f28eba64998dca7a63623c3669235430
90b722485e99ddcf014b3529bea96f0d3f348b8a

View File

@ -1 +1 @@
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
a5a87987051fc8c3a86db6f61262e51f84485b7c

View File

@ -1 +1 @@
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
b7adf8773ef9e5b9312ae94f69e1f5fa546fa6c0

View File

@ -1 +1 @@
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
655381076049e9a1ecc571f6f8f964e5d6bec7e9

View File

@ -1 +1 @@
062571da4540762deb844a90f281991f1e8a674d
981bd3aadd27a0bd14b6e6c63770cef580cc2bea

View File

@ -1 +1 @@
3c61a6f5c4402955173c29c7e5d95d023277dc18
e15b991bd78eca42eb48c6306d6a0582034cfedd

View File

@ -1 +1 @@
c571f51c5786e5b3ee1efdf22f890b89ed975f14
529579cdf52dd2bd45773d5499054966cd0b5615

View File

@ -1 +1 @@
31a417e6f28eba64998dca7a63623c3669235430
90b722485e99ddcf014b3529bea96f0d3f348b8a

View File

@ -1 +1 @@
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
a5a87987051fc8c3a86db6f61262e51f84485b7c

View File

@ -1 +1 @@
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
b7adf8773ef9e5b9312ae94f69e1f5fa546fa6c0

View File

@ -1 +1 @@
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
655381076049e9a1ecc571f6f8f964e5d6bec7e9

View File

@ -1 +1 @@
062571da4540762deb844a90f281991f1e8a674d
981bd3aadd27a0bd14b6e6c63770cef580cc2bea

View File

@ -1 +1 @@
3c61a6f5c4402955173c29c7e5d95d023277dc18
e15b991bd78eca42eb48c6306d6a0582034cfedd

View File

@ -1 +1 @@
c571f51c5786e5b3ee1efdf22f890b89ed975f14
529579cdf52dd2bd45773d5499054966cd0b5615

View File

@ -1 +1 @@
31a417e6f28eba64998dca7a63623c3669235430
90b722485e99ddcf014b3529bea96f0d3f348b8a

View File

@ -1 +1 @@
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
a5a87987051fc8c3a86db6f61262e51f84485b7c

View File

@ -1 +1 @@
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
b7adf8773ef9e5b9312ae94f69e1f5fa546fa6c0

View File

@ -1 +1 @@
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
655381076049e9a1ecc571f6f8f964e5d6bec7e9

View File

@ -1 +1 @@
062571da4540762deb844a90f281991f1e8a674d
981bd3aadd27a0bd14b6e6c63770cef580cc2bea

View File

@ -1 +1 @@
3c61a6f5c4402955173c29c7e5d95d023277dc18
e15b991bd78eca42eb48c6306d6a0582034cfedd

View File

@ -1 +1 @@
c571f51c5786e5b3ee1efdf22f890b89ed975f14
529579cdf52dd2bd45773d5499054966cd0b5615

View File

@ -1 +1 @@
31a417e6f28eba64998dca7a63623c3669235430
90b722485e99ddcf014b3529bea96f0d3f348b8a

View File

@ -1 +1 @@
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
a5a87987051fc8c3a86db6f61262e51f84485b7c

View File

@ -1 +1 @@
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
b7adf8773ef9e5b9312ae94f69e1f5fa546fa6c0

View File

@ -1 +1 @@
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
655381076049e9a1ecc571f6f8f964e5d6bec7e9

View File

@ -1 +1 @@
062571da4540762deb844a90f281991f1e8a674d
981bd3aadd27a0bd14b6e6c63770cef580cc2bea

View File

@ -1 +1 @@
3c61a6f5c4402955173c29c7e5d95d023277dc18
e15b991bd78eca42eb48c6306d6a0582034cfedd

View File

@ -1 +1 @@
c571f51c5786e5b3ee1efdf22f890b89ed975f14
529579cdf52dd2bd45773d5499054966cd0b5615

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/2b6f395"
#define FULL_VERSION "explicit/c35bd54"

Binary file not shown.

View File

@ -1 +1 @@
dfbe22a8952f40436357b9c67943b841b362c4d2
c71beba84bf8908d32edce9e510f05d5223b2e3d

Binary file not shown.

View File

@ -1 +1 @@
1f4e1fe28706b09d8add1609c6059c44feb08117
716bfe4ee261f3bb06c74aca64e717dde204100d

Binary file not shown.

View File

@ -1 +1 @@
e8a095bd92d2ea011ea147933a1acbd031887946
7d38c8ec3eec270b5ae74aa789f3783cab23d4ef

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.20.0.217\n"
"Project-Id-Version: mono 5.20.0.218\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-02-19 08:08+0000\n"
"POT-Creation-Date: 2019-02-21 08:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
628651a44eae056b7f3aa222df5c9cdad7b889a4
8a95f962330acb45eba4a067ae2454f484bb7ae0