[gnome-disk-utility] volume-grid: don't set the PRELIGHT state flag
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] volume-grid: don't set the PRELIGHT state flag
- Date: Tue, 20 Mar 2012 16:47:29 +0000 (UTC)
commit 2a2af2a3294a643d82faf0a48af35d622722faf6
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Mar 19 13:29:39 2012 -0400
volume-grid: don't set the PRELIGHT state flag
Since items on the grid are not actionable on click, but with the
toolbar below, the hover state is just potentially confusing.
https://bugzilla.gnome.org/show_bug.cgi?id=672376
Signed-off-by: David Zeuthen <davidz redhat com>
src/palimpsest/gduvolumegrid.c | 43 +---------------------------------------
1 files changed, 1 insertions(+), 42 deletions(-)
---
diff --git a/src/palimpsest/gduvolumegrid.c b/src/palimpsest/gduvolumegrid.c
index d31381c..bbadcb3 100644
--- a/src/palimpsest/gduvolumegrid.c
+++ b/src/palimpsest/gduvolumegrid.c
@@ -99,8 +99,6 @@ struct _GduVolumeGrid
UDisksClient *client;
UDisksObject *block_object;
- gboolean pointer_inside;
-
gboolean container_visible;
gchar *container_markup;
@@ -490,36 +488,6 @@ gdu_volume_grid_get_preferred_height (GtkWidget *widget,
*minimal_height = *natural_height = 120;
}
-static gboolean
-gdu_volume_grid_enter (GtkWidget *widget,
- GdkEventCrossing *event)
-{
- GduVolumeGrid *grid = GDU_VOLUME_GRID (widget);
- grid->pointer_inside = TRUE;
- gtk_widget_queue_draw (widget);
- return TRUE;
-}
-
-static gboolean
-gdu_volume_grid_leave (GtkWidget *widget,
- GdkEventCrossing *event)
-{
- GduVolumeGrid *grid = GDU_VOLUME_GRID (widget);
- grid->pointer_inside = FALSE;
- gtk_widget_queue_draw (widget);
- return TRUE;
-}
-
-static gboolean
-gdu_volume_grid_motion (GtkWidget *widget,
- GdkEventMotion *event)
-{
- GduVolumeGrid *grid = GDU_VOLUME_GRID (widget);
- if (grid->pointer_inside)
- gtk_widget_queue_draw (widget);
- return TRUE;
-}
-
static void
gdu_volume_grid_class_init (GduVolumeGridClass *klass)
{
@@ -539,9 +507,6 @@ gdu_volume_grid_class_init (GduVolumeGridClass *klass)
gtkwidget_class->get_preferred_width = gdu_volume_grid_get_preferred_width;
gtkwidget_class->get_preferred_height = gdu_volume_grid_get_preferred_height;
gtkwidget_class->draw = gdu_volume_grid_draw;
- gtkwidget_class->enter_notify_event = gdu_volume_grid_enter;
- gtkwidget_class->leave_notify_event = gdu_volume_grid_leave;
- gtkwidget_class->motion_notify_event = gdu_volume_grid_motion;
g_object_class_install_property (gobject_class,
PROP_CLIENT,
@@ -792,13 +757,7 @@ render_element (GduVolumeGrid *grid,
context = gtk_widget_get_style_context (GTK_WIDGET (grid));
gtk_style_context_save (context);
state = gtk_widget_get_state_flags (GTK_WIDGET (grid));
- if (grid->pointer_inside)
- {
- gint px, py;
- gtk_widget_get_pointer (GTK_WIDGET (grid), &px, &py);
- if (px >= x && px < x + w && py >= y && py < y + h)
- state |= GTK_STATE_FLAG_PRELIGHT;
- }
+
if (is_selected)
state |= GTK_STATE_FLAG_SELECTED;
if (is_grid_focused)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]