AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

revert generic disabling of PRELIGHT state for the reasons given in bug

Browse Source 
2007-01-24  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkwidget.c (gtk_widget_set_state): revert generic disabling
	of PRELIGHT state for the reasons given in bug #135666. Widget
	states are sometimes abused or otherwise used wrongly for historic
	reasons, causing this part of the patch to break e.g. menu items.


svn path=/trunk/; revision=17211
This commit is contained in:
Michael Natterer 2007-01-24 16:10:40 +00:00 committed by Michael Natterer
parent 5a1ff3b59f
commit 7446ae9fd7
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-01-24 Michael Natterer <mitch@imendio.com>
* gtk/gtkwidget.c (gtk_widget_set_state): revert generic disabling
of PRELIGHT state for the reasons given in bug #135666. Widget
states are sometimes abused or otherwise used wrongly for historic
reasons, causing this part of the patch to break e.g. menu items.
2007-01-24 Roozbeh Pournader <roozbeh@farsiweb.info>
* README: Remove mention of no-longer-existing PATCH

9
gtk/gtkwidget.c
View File

@ -4531,20 +4531,11 @@ void
gtk_widget_set_state (GtkWidget *widget,
GtkStateType state)
{
gboolean touchscreen;
g_return_if_fail (GTK_IS_WIDGET (widget));
if (state == GTK_WIDGET_STATE (widget))
return;
g_object_get (gtk_widget_get_settings (widget),
"gtk-touchscreen-mode", &touchscreen,
NULL);
if (touchscreen && state == GTK_STATE_PRELIGHT)
state = GTK_STATE_NORMAL;
if (state == GTK_STATE_INSENSITIVE)
gtk_widget_set_sensitive (widget, FALSE);
else