Merge pull request #17568 from darktable-org/po/filmstrip-sel

change way to interact with filmstrip

Author: TurboGit

src/common/selection.h

@@ -51,13 +51,14 @@ void dt_selection_select_list(struct dt_selection_t *selection, GList *list);
 /** selects a set of images from a list. the list is unaltered */
 const struct dt_collection_t *dt_selection_get_collection(struct dt_selection_t *selection);
 /** get the list of selected images */
-GList *dt_selection_get_list(struct dt_selection_t *selection, const gboolean only_visible,
+GList *dt_selection_get_list(struct dt_selection_t *selection,
+                             const gboolean only_visible,
                              const gboolean ordering);
-gchar *dt_selection_get_list_query(struct dt_selection_t *selection, const gboolean only_visible,
+gchar *dt_selection_get_list_query(struct dt_selection_t *selection,
+                                   const gboolean only_visible,
                                    const gboolean ordering);
 // clang-format off
 // modelines: These editor modelines have been set for all relevant files by tools/update_modelines.py
 // vim: shiftwidth=2 expandtab tabstop=2 cindent
 // kate: tab-indents: off; indent-width 2; replace-tabs on; indent-mode cstyle; remove-trailing-spaces modified;
 // clang-format on
-

src/dtgtk/thumbnail.c

@@ -941,51 +941,13 @@ static gboolean _event_main_motion(GtkWidget *widget,
   return FALSE;
 }
 
-static gboolean _event_main_press(GtkWidget *widget,
-                                  GdkEventButton *event,
-                                  gpointer user_data)
-{
-  dt_thumbnail_t *thumb = (dt_thumbnail_t *)user_data;
-  if(event->button == 1
-     && ((event->type == GDK_2BUTTON_PRESS && !thumb->single_click)
-         || (event->type == GDK_BUTTON_PRESS
-             && dt_modifier_is(event->state, 0) && thumb->single_click)))
-  {
-    dt_control_set_mouse_over_id(thumb->imgid);
-    // to ensure we haven't lost imgid during double-click
-  }
-  return FALSE;
-}
-static gboolean _event_main_release(GtkWidget *widget,
-                                    GdkEventButton *event,
-                                    gpointer user_data)
-{
-  dt_thumbnail_t *thumb = (dt_thumbnail_t *)user_data;
-
-  if(event->button == 1
-     && !thumb->moved
-     && thumb->sel_mode != DT_THUMBNAIL_SEL_MODE_DISABLED)
-  {
-    if(dt_modifier_is(event->state, 0)
-       && thumb->sel_mode != DT_THUMBNAIL_SEL_MODE_MOD_ONLY)
-      dt_selection_select_single(darktable.selection, thumb->imgid);
-    else if(dt_modifier_is(event->state, GDK_MOD1_MASK))
-      dt_selection_select_single(darktable.selection, thumb->imgid);
-    else if(dt_modifier_is(event->state, GDK_CONTROL_MASK)
-            || dt_modifier_is(event->state, GDK_MOD2_MASK)) // CMD key on macOS
-      dt_selection_toggle(darktable.selection, thumb->imgid);
-    else if(dt_modifier_is(event->state, GDK_SHIFT_MASK))
-      dt_selection_select_range(darktable.selection, thumb->imgid);
-  }
-  return FALSE;
-}
-
 static gboolean _event_rating_press(GtkWidget *widget,
                                     GdkEventButton *event,
                                     gpointer user_data)
 {
   return TRUE;
 }
+
 static gboolean _event_rating_release(GtkWidget *widget,
                                       GdkEventButton *event,
                                       gpointer user_data)
@@ -1402,11 +1364,6 @@ GtkWidget *dt_thumbnail_create_widget(dt_thumbnail_t *thumb,
     g_signal_connect(G_OBJECT(thumb->w_main), "drag-motion",
                      G_CALLBACK(_event_main_drag_motion), thumb);
 
-    g_signal_connect(G_OBJECT(thumb->w_main), "button-press-event",
-                     G_CALLBACK(_event_main_press), thumb);
-    g_signal_connect(G_OBJECT(thumb->w_main), "button-release-event",
-                     G_CALLBACK(_event_main_release), thumb);
-
     g_object_set_data(G_OBJECT(thumb->w_main), "thumb", thumb);
     DT_DEBUG_CONTROL_SIGNAL_CONNECT(darktable.signals, DT_SIGNAL_ACTIVE_IMAGES_CHANGE,
                               G_CALLBACK(_dt_active_images_callback), thumb);