Imported Upstream version 5.20.0.218
Former-commit-id: 64ebf470924e7da80b62546c8e82a1a7a1c1f4d7
This commit is contained in:
parent
6eb9e6b2ec
commit
f3bae400cb
@ -1 +1 @@
|
|||||||
8b48627b7bb555f063c3263fc4eb2f11597e3729
|
53ecca0a916d5199c18b953531f379fbf197d4b6
|
@ -1 +1 @@
|
|||||||
37bdd1e7ff88dbc3ff4aaedf2df82bf2aeae3813
|
7b90edbc24c557975585b51e6d60bb43a5bf0bbb
|
3
external/bockbuild/packages/gtk+.py
vendored
3
external/bockbuild/packages/gtk+.py
vendored
@ -217,7 +217,8 @@ class GtkPackage (GitHubPackage):
|
|||||||
|
|
||||||
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/737323
|
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/737323
|
||||||
'patches/gtk/gtk-nsview-subview-focus-fixes.patch',
|
'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):
|
def prep(self):
|
||||||
|
39
external/bockbuild/packages/patches/gtk/popup-combo-box-with-arrows.patch
vendored
Normal file
39
external/bockbuild/packages/patches/gtk/popup-combo-box-with-arrows.patch
vendored
Normal 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,
|
@ -34,7 +34,7 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// 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 MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
|
@ -1 +1 @@
|
|||||||
31a417e6f28eba64998dca7a63623c3669235430
|
90b722485e99ddcf014b3529bea96f0d3f348b8a
|
@ -1 +1 @@
|
|||||||
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
|
a5a87987051fc8c3a86db6f61262e51f84485b7c
|
@ -1 +1 @@
|
|||||||
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
|
b7adf8773ef9e5b9312ae94f69e1f5fa546fa6c0
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
|
655381076049e9a1ecc571f6f8f964e5d6bec7e9
|
@ -1 +1 @@
|
|||||||
062571da4540762deb844a90f281991f1e8a674d
|
981bd3aadd27a0bd14b6e6c63770cef580cc2bea
|
@ -1 +1 @@
|
|||||||
3c61a6f5c4402955173c29c7e5d95d023277dc18
|
e15b991bd78eca42eb48c6306d6a0582034cfedd
|
@ -1 +1 @@
|
|||||||
c571f51c5786e5b3ee1efdf22f890b89ed975f14
|
529579cdf52dd2bd45773d5499054966cd0b5615
|
@ -1 +1 @@
|
|||||||
31a417e6f28eba64998dca7a63623c3669235430
|
90b722485e99ddcf014b3529bea96f0d3f348b8a
|
@ -1 +1 @@
|
|||||||
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
|
a5a87987051fc8c3a86db6f61262e51f84485b7c
|
@ -1 +1 @@
|
|||||||
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
|
b7adf8773ef9e5b9312ae94f69e1f5fa546fa6c0
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
|
655381076049e9a1ecc571f6f8f964e5d6bec7e9
|
@ -1 +1 @@
|
|||||||
062571da4540762deb844a90f281991f1e8a674d
|
981bd3aadd27a0bd14b6e6c63770cef580cc2bea
|
@ -1 +1 @@
|
|||||||
3c61a6f5c4402955173c29c7e5d95d023277dc18
|
e15b991bd78eca42eb48c6306d6a0582034cfedd
|
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