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

Revert "file chooser: Allow activating without double-click"

Browse Source 
This reverts commit fb0a13b7f0.

It's already reverted in master via
c8a6a1138b4e1772817be661a435dd16941d6445, so let's not leave subtle
behavior changes that would make a gtk3->gtk4 migration. And just like
the commit message of the revert already mentions: it didn't really make
anybody happy anyway.
This commit is contained in:
Timm Bäder 2018-03-01 19:39:49 +01:00
parent b13362b369
commit f0d5b9561b
1 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gtk/gtkfilechooserwidget.c
View File

@ -77,7 +77,6 @@
#include "gtkseparator.h"
#include "gtkmodelbutton.h"
#include "gtkgesturelongpress.h"
#include "gtkdebug.h"
#include <cairo-gobject.h>
@ -2379,25 +2378,6 @@ list_popup_menu_cb (GtkWidget *widget,
return TRUE;
}
static void
get_selection_modifiers (GtkWidget *widget,
GdkEventButton *event,
gboolean *modify,
gboolean *extend)
{
GdkModifierType mask;
*modify = FALSE;
*extend = FALSE;
mask = gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_MODIFY_SELECTION);
if ((event->state & mask) == mask)
*modify = TRUE;
mask = gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_EXTEND_SELECTION);
if ((event->state & mask) == mask)
*extend = TRUE;
}
/* Callback used when a button is pressed on the file list. We trap button 3 to
* bring up a popup menu.
*/
@ -2408,40 +2388,10 @@ list_button_press_event_cb (GtkWidget *widget,
{
GtkFileChooserWidgetPrivate *priv = impl->priv;
static gboolean in_press = FALSE;
GtkTreePath *path;
GtkTreeViewColumn *column;
GdkDevice *device;
gboolean modify, extend, is_touchscreen;
if (in_press)
return FALSE;
device = gdk_event_get_source_device ((GdkEvent *) event);
is_touchscreen = gtk_simulate_touchscreen () ||
gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN;
get_selection_modifiers (widget, event, &modify, &extend);
if (!is_touchscreen &&
!modify && !extend &&
event->type == GDK_BUTTON_PRESS &&
event->button == GDK_BUTTON_PRIMARY &&
gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->browse_files_tree_view),
event->x, event->y,
&path, &column, NULL, NULL))
{
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view));
if (gtk_tree_selection_path_is_selected (selection, path))
{
list_row_activated (GTK_TREE_VIEW (priv->browse_files_tree_view), path, column, impl);
gtk_tree_path_free (path);
return TRUE;
}
gtk_tree_path_free (path);
}
if (!gdk_event_triggers_context_menu ((GdkEvent *) event))
return FALSE;