[gtk+/multitouch: 9/121] gtksettings: Set animation for press-and-hold through GtkStyleProvider
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/multitouch: 9/121] gtksettings: Set animation for press-and-hold through GtkStyleProvider
- Date: Thu, 12 Jan 2012 14:17:51 +0000 (UTC)
commit e7574383e727f3e4f0b6f82968981fee212ca8f6
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Nov 1 02:48:40 2011 +0100
gtksettings: Set animation for press-and-hold through GtkStyleProvider
The "gtk-press-and-hold-timeout" setting has also been added, to control
its duration.
gtk/gtksettings.c | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index ac90cdd..48579aa 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -32,8 +32,10 @@
#include "gtkwidget.h"
#include "gtkprivate.h"
#include "gtkcssproviderprivate.h"
+#include "gtkcssstylepropertyprivate.h"
#include "gtkstyleproviderprivate.h"
#include "gtksymboliccolor.h"
+#include "gtkanimationdescription.h"
#include "gtktypebuiltins.h"
#include "gtkversion.h"
@@ -97,9 +99,10 @@
*/
-#define DEFAULT_TIMEOUT_INITIAL 200
-#define DEFAULT_TIMEOUT_REPEAT 20
-#define DEFAULT_TIMEOUT_EXPAND 500
+#define DEFAULT_TIMEOUT_INITIAL 200
+#define DEFAULT_TIMEOUT_REPEAT 20
+#define DEFAULT_TIMEOUT_EXPAND 500
+#define DEFAULT_TIMEOUT_PRESS_AND_HOLD 800
typedef struct _GtkSettingsPropertyValue GtkSettingsPropertyValue;
typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate;
@@ -1479,6 +1482,34 @@ gtk_settings_style_provider_lookup (GtkStyleProviderPrivate *provider,
path,
state,
lookup);
+
+ /* Set animation for press and hold */
+ if (gtk_widget_path_iter_has_class (path, 0, GTK_STYLE_CLASS_PRESS_AND_HOLD))
+ {
+ GtkAnimationDescription *anim_desc;
+ static GValue anim_value = { 0 };
+ GtkStyleProperty *prop;
+ gint duration;
+
+ if (!G_IS_VALUE (&anim_value))
+ {
+ g_object_get (settings,
+ "gtk-press-and-hold-timeout", &duration,
+ NULL);
+
+ anim_desc = _gtk_animation_description_new (duration,
+ GTK_TIMELINE_PROGRESS_LINEAR,
+ FALSE);
+ g_value_init (&anim_value, GTK_TYPE_ANIMATION_DESCRIPTION);
+ g_value_take_boxed (&anim_value, anim_desc);
+ }
+
+ prop = _gtk_style_property_lookup ("transition");
+
+ _gtk_css_lookup_set (lookup,
+ _gtk_css_style_property_get_id (GTK_CSS_STYLE_PROPERTY (prop)),
+ NULL, &anim_value);
+ }
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]