Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtksettings: Set animation for press-and-hold through GtkStyleProvider

Browse Source 
The "gtk-press-and-hold-timeout" setting has also been added, to control
its duration.
This commit is contained in:
Carlos Garnacho
2011-11-01 02:48:40 +01:00
parent 388dcb4234
commit fbb70becef
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtksettings.c
View File

@@ -33,6 +33,7 @@
#include "gtkprivate.h"
#include "gtkcssproviderprivate.h"
#include "gtksymboliccolor.h"
#include "gtkanimationdescription.h"
#include "gtktypebuiltins.h"
#include "gtkversion.h"
@@ -96,9 +97,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;
@@ -1441,6 +1443,33 @@ gtk_settings_get_style (GtkStyleProvider *provider,
settings_ensure_style (settings);
/* Set animation for press and hold */
if (gtk_widget_path_iter_has_class (path, 0, GTK_STYLE_CLASS_PRESS_AND_HOLD))
{
GtkAnimationDescription *anim_desc;
GtkStyleProperties *copy;
gint duration;
copy = gtk_style_properties_new ();
gtk_style_properties_merge (copy, settings->priv->style, TRUE);
g_object_get (settings,
"gtk-press-and-hold-timeout", &duration,
NULL);
anim_desc = _gtk_animation_description_new (duration,
GTK_TIMELINE_PROGRESS_LINEAR,
FALSE);
gtk_style_properties_set (copy,
GTK_STATE_FLAG_ACTIVE,
"transition", anim_desc,
NULL);
_gtk_animation_description_unref (anim_desc);
return copy;
}
return g_object_ref (settings->priv->style);
}