summaryrefslogtreecommitdiff
path: root/src/xfdesktop-icon-view.c
diff options
context:
space:
mode:
authorEric Koegel <eric.koegel@gmail.com>2017-04-19 16:47:18 +0300
committerEric Koegel <eric.koegel@gmail.com>2017-04-19 18:46:05 +0300
commit58c9309e5364e2b06d94def4324c2ed7d2b455d5 (patch)
tree3deee3c0936d85e0ec6206f94898aaa54be63bdd /src/xfdesktop-icon-view.c
parent13c901da107c806294ca757144b2a68eb53772c8 (diff)
downloadxfdesktop-58c9309e5364e2b06d94def4324c2ed7d2b455d5.tar.gz
Fix double menu popup
When right clicking on an icon, the button release event gets called twice and was popping up the menu twice.
Diffstat (limited to 'src/xfdesktop-icon-view.c')
-rw-r--r--src/xfdesktop-icon-view.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index 239441a6..a5043029 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -917,7 +917,7 @@ xfdesktop_icon_view_button_press(GtkWidget *widget,
g_signal_emit(G_OBJECT(icon_view), __signals[SIG_ICON_ACTIVATED],
0, NULL);
xfdesktop_icon_activated(icon);
- //xfdesktop_icon_view_unselect_item(icon_view, icon);
+
xfdesktop_icon_view_unselect_all(icon_view);
}
}
@@ -1001,7 +1001,8 @@ xfdesktop_icon_view_button_release(GtkWidget *widget,
if((evt->button == 3 || (evt->button == 1 && (evt->state & GDK_SHIFT_MASK))) &&
icon_view->priv->definitely_dragging == FALSE &&
- icon_view->priv->definitely_rubber_banding == FALSE)
+ icon_view->priv->definitely_rubber_banding == FALSE &&
+ icon_view->priv->maybe_begin_drag == TRUE)
{
/* If we're in single click mode we may already have the icon, don't
* find it again. */