diff options
author | Ross Burton <ross.burton@intel.com> | 2014-12-19 19:52:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 08:14:25 +0000 |
commit | 9e64b6d96c0434d91150c3b4829046e6d70b0e00 (patch) | |
tree | 7f47b0697fcff0c2244841308df33f7d6ce73159 /meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch | |
parent | db8bf52277c1596e0703cee21ff52cad04365eb7 (diff) | |
download | poky-9e64b6d96c0434d91150c3b4829046e6d70b0e00.tar.gz |
gtk+: upgrade to 2.24.25
Remove patches that are no longer needed:
* GtkButton-do-no-prelight: merged upstream
* Duplicate-the-exec-string: upstream decided this behaviour is incorrect
* cellrenderer-cairo: Cairo isn't the performance bottleneck it once was, drop
* configure-nm: resolved upstrea
* configurefix.patch: not applied
* run-iconcache: not needed when building tarballs, and if gtk-update-icon-cache
is needed at build time (e.g. user is customising default icon theme) then
they can add a dependency on gtk-update-icon-cache-native.
Also remove mention of patches that have been commented out for a long time.
(From OE-Core rev: 9299b5d2e5f82cf0e3f66ca49dedbe2c8b18bb44)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch deleted file mode 100644 index 71e334d897..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From d1f7a894674dfdd6769f1bbae31eb1a69e451a5c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 16 Nov 2012 22:07:28 +0100 | ||
4 | Subject: [PATCH] GtkButton: do not prelight in touchscreen mode | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Code was copied from GtkToggleButton. | ||
10 | |||
11 | Upstream-Status: submitted [1] | ||
12 | |||
13 | [1] https://bugzilla.gnome.org/show_bug.cgi?id=689138 | ||
14 | |||
15 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
16 | --- | ||
17 | gtk/gtkbutton.c | 8 ++++++-- | ||
18 | 1 files changed, 6 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c | ||
21 | index f472007..1beb1b6 100644 | ||
22 | --- a/gtk/gtkbutton.c | ||
23 | +++ b/gtk/gtkbutton.c | ||
24 | @@ -2079,15 +2079,19 @@ _gtk_button_set_depressed (GtkButton *button, | ||
25 | static void | ||
26 | gtk_button_update_state (GtkButton *button) | ||
27 | { | ||
28 | - gboolean depressed; | ||
29 | + gboolean depressed, touchscreen; | ||
30 | GtkStateType new_state; | ||
31 | |||
32 | + g_object_get (gtk_widget_get_settings (GTK_WIDGET (button)), | ||
33 | + "gtk-touchscreen-mode", &touchscreen, | ||
34 | + NULL); | ||
35 | + | ||
36 | if (button->activate_timeout) | ||
37 | depressed = button->depress_on_activate; | ||
38 | else | ||
39 | depressed = button->in_button && button->button_down; | ||
40 | |||
41 | - if (button->in_button && (!button->button_down || !depressed)) | ||
42 | + if (!touchscreen && button->in_button && (!button->button_down || !depressed)) | ||
43 | new_state = GTK_STATE_PRELIGHT; | ||
44 | else | ||
45 | new_state = depressed ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL; | ||
46 | -- | ||
47 | 1.7.6.5 | ||
48 | |||