callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

togglebutton: Remove gtk-touchcreen-mode usage

Browse Source 
Emulated crossing events with mode GDK_CROSSING_TOUCH_PRESS/RELEASE
already cater dynamically for the "don't prelight on touch devices"
usecase.
This commit is contained in:
Carlos Garnacho
2011-12-12 19:11:41 +01:00
committed by Matthias Clasen
parent 24e9a19abe
commit 87f6bb32ed
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtktogglebutton.c
View File

@ -656,13 +656,9 @@ gtk_toggle_button_update_state (GtkButton *button)
{ {
GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (button); GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (button);
GtkToggleButtonPrivate *priv = toggle_button->priv; GtkToggleButtonPrivate *priv = toggle_button->priv;
gboolean depressed, touchscreen; gboolean depressed;
GtkStateFlags new_state = 0; GtkStateFlags new_state = 0;
g_object_get (gtk_widget_get_settings (GTK_WIDGET (button)),
"gtk-touchscreen-mode", &touchscreen,
NULL);
new_state = gtk_widget_get_state_flags (GTK_WIDGET (button)) & new_state = gtk_widget_get_state_flags (GTK_WIDGET (button)) &
~(GTK_STATE_FLAG_INCONSISTENT | ~(GTK_STATE_FLAG_INCONSISTENT |
GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_PRELIGHT |
@ -678,7 +674,7 @@ gtk_toggle_button_update_state (GtkButton *button)
else else
depressed = priv->active; depressed = priv->active;
if (!touchscreen && button->priv->in_button && (!button->priv->button_down || priv->draw_indicator)) if (button->priv->in_button && (!button->priv->button_down || priv->draw_indicator))
new_state |= GTK_STATE_FLAG_PRELIGHT; new_state |= GTK_STATE_FLAG_PRELIGHT;
if (depressed) if (depressed)