[nautilus/wip/antoniof/flow-box-preparation: 14/14] view-icon-controller: Implement single-click mode
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/antoniof/flow-box-preparation: 14/14] view-icon-controller: Implement single-click mode
- Date: Fri, 10 Dec 2021 13:55:17 +0000 (UTC)
commit 95b315f8ca665324cb17fa87f4c6f1c6c4db4dee
Author: António Fernandes <antoniof gnome org>
Date: Wed Dec 8 22:47:40 2021 +0000
view-icon-controller: Implement single-click mode
GtkFlowBox:activate-on-single-click is not fit for our purpose, as it
introduces changes to selection modification which don't fit our desired
behavior.
Introduce our own mechanism to activate children on single click.
src/nautilus-view-icon-controller.c | 53 +++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
---
diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c
index 6fa7c74f0..09d7da508 100644
--- a/src/nautilus-view-icon-controller.c
+++ b/src/nautilus-view-icon-controller.c
@@ -20,6 +20,8 @@ struct _NautilusViewIconController
GActionGroup *action_group;
gint zoom_level;
+ gboolean single_click_mode;
+ gboolean activate_on_release;
GtkGesture *multi_press_gesture;
guint scroll_to_file_handle_id;
@@ -695,9 +697,22 @@ real_reveal_for_selection_context_menu (NautilusFilesView *files_view)
return get_rectangle_for_item_ui (self, item_ui);
}
+static void
+set_click_mode_from_settings (NautilusViewIconController *self)
+{
+ int click_policy;
+
+ click_policy = g_settings_get_enum (nautilus_preferences,
+ NAUTILUS_PREFERENCES_CLICK_POLICY);
+
+ self->single_click_mode = (click_policy == NAUTILUS_CLICK_POLICY_SINGLE);
+}
+
static void
real_click_policy_changed (NautilusFilesView *files_view)
{
+ NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view);
+ set_click_mode_from_settings (self);
}
static void
@@ -753,6 +768,10 @@ on_button_press_event (GtkGestureMultiPress *gesture,
gboolean selection_mode;
selection_mode = (modifiers & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
+ self->activate_on_release = (self->single_click_mode &&
+ button == GDK_BUTTON_PRIMARY &&
+ n_press == 1 &&
+ !selection_mode);
/* GtkFlowBox changes selection only with the primary button, but we
* need that to happen with all buttons, otherwise e.g. opening context
@@ -780,6 +799,7 @@ on_button_press_event (GtkGestureMultiPress *gesture,
{
activate_selection_on_click (self, modifiers & GDK_SHIFT_MASK);
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+ self->activate_on_release = FALSE;
}
else if (button == GDK_BUTTON_MIDDLE && n_press == 1 && !selection_mode)
{
@@ -803,6 +823,32 @@ on_button_press_event (GtkGestureMultiPress *gesture,
}
}
+static void
+on_click_released (GtkGestureMultiPress *gesture,
+ gint n_press,
+ gdouble x,
+ gdouble y,
+ gpointer user_data)
+{
+ NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (user_data);
+
+ if (self->activate_on_release)
+ {
+ activate_selection_on_click (self, FALSE);
+ gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+ }
+ self->activate_on_release = FALSE;
+}
+
+static void
+on_click_stopped (GtkGestureMultiPress *gesture,
+ gpointer user_data)
+{
+ NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (user_data);
+
+ self->activate_on_release = FALSE;
+}
+
static void
on_longpress_gesture_pressed_callback (GtkGestureLongPress *gesture,
gdouble x,
@@ -1195,6 +1241,8 @@ create_view_ui (NautilusViewIconController *self)
gtk_widget_set_valign (widget, GTK_ALIGN_START);
flowbox = GTK_FLOW_BOX (widget);
+ /* We don't use GtkFlowBox's single click mode because it doesn't match our
+ * expected behavior. Instead, we roll our own self->single_click_mode. */
gtk_flow_box_set_activate_on_single_click (flowbox, FALSE);
gtk_flow_box_set_max_children_per_line (flowbox, 20);
gtk_flow_box_set_selection_mode (flowbox, GTK_SELECTION_MULTIPLE);
@@ -1247,6 +1295,10 @@ constructed (GObject *object)
0);
g_signal_connect (self->multi_press_gesture, "pressed",
G_CALLBACK (on_button_press_event), self);
+ g_signal_connect (self->multi_press_gesture, "stopped",
+ G_CALLBACK (on_click_stopped), self);
+ g_signal_connect (self->multi_press_gesture, "released",
+ G_CALLBACK (on_click_released), self);
longpress_gesture = gtk_gesture_long_press_new (GTK_WIDGET (self->view_ui));
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (longpress_gesture),
@@ -1328,6 +1380,7 @@ nautilus_view_icon_controller_class_init (NautilusViewIconControllerClass *klass
static void
nautilus_view_icon_controller_init (NautilusViewIconController *self)
{
+ set_click_mode_from_settings (self);
}
NautilusViewIconController *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]