Skip to content

gtk4-prep: fix right-click popups on filter and range entries #21718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TurboGit merged 2 commits into from
Aug 5, 2026
Merged

gtk4-prep: fix right-click popups on filter and range entries #21718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bae84f
gtk4-prep: fix misc filter right-click after event controller conversion
Arecsu Aug 4, 2026
a726e1d
gtk4-prep: fix filename and range entry right-click popups
Arecsu Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/dtgtk/range.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1718,15 +1718,19 @@ GtkWidget *dtgtk_range_select_new(const gchar *property, const gboolean show_ent
_entry_set_tooltip(range->entry_min, BOUND_MIN, range->type);
g_signal_connect(G_OBJECT(range->entry_min), "activate", G_CALLBACK(_event_entry_activated), range);
g_signal_connect(G_OBJECT(range->entry_min), "focus-out-event", G_CALLBACK(_event_entry_focus_out), range);
dt_gui_connect_click_all(range->entry_min, _event_entry_press_cb, NULL, range);
GtkGestureSingle *g_min = dt_gui_connect_click(range->entry_min, _event_entry_press_cb, NULL, range);
gtk_gesture_single_set_button(g_min, GDK_BUTTON_SECONDARY);
gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER(g_min), GTK_PHASE_TARGET);

range->entry_max = dt_ui_entry_new(0);
gtk_widget_set_can_default(range->entry_max, TRUE);
gtk_entry_set_alignment(GTK_ENTRY(range->entry_max), 1.0);
_entry_set_tooltip(range->entry_max, BOUND_MAX, range->type);
g_signal_connect(G_OBJECT(range->entry_max), "activate", G_CALLBACK(_event_entry_activated), range);
g_signal_connect(G_OBJECT(range->entry_max), "focus-out-event", G_CALLBACK(_event_entry_focus_out), range);
dt_gui_connect_click_all(range->entry_max, _event_entry_press_cb, NULL, range);
GtkGestureSingle *g_max = dt_gui_connect_click(range->entry_max, _event_entry_press_cb, NULL, range);
gtk_gesture_single_set_button(g_max, GDK_BUTTON_SECONDARY);
gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER(g_max), GTK_PHASE_TARGET);

dt_gui_box_add(vbox, dt_gui_hbox(dt_gui_expand(range->entry_min), dt_gui_expand(range->entry_max)));
}
Expand Down
8 changes: 6 additions & 2 deletions src/libs/filters/filename.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,9 @@ static void _filename_widget_init(dt_lib_filtering_rule_t *rule, const dt_collec
gtk_box_pack_start(GTK_BOX(hb), filename->name, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(filename->name), "activate", G_CALLBACK(_filename_changed), filename);
g_signal_connect(G_OBJECT(filename->name), "focus-out-event", G_CALLBACK(_filename_focus_out), filename);
dt_gui_connect_click(filename->name, _filename_press, NULL, filename);
GtkGestureSingle *g_name = dt_gui_connect_click(filename->name, _filename_press, NULL, filename);
gtk_gesture_single_set_button(g_name, GDK_BUTTON_SECONDARY);
gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER(g_name), GTK_PHASE_TARGET);

filename->ext = dt_ui_entry_new(top ? 5 : 0);
gtk_widget_set_can_default(filename->ext, TRUE);
Expand All @@ -384,7 +386,9 @@ static void _filename_widget_init(dt_lib_filtering_rule_t *rule, const dt_collec
gtk_box_pack_start(GTK_BOX(hb), filename->ext, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(filename->ext), "activate", G_CALLBACK(_filename_changed), filename);
g_signal_connect(G_OBJECT(filename->ext), "focus-out-event", G_CALLBACK(_filename_focus_out), filename);
dt_gui_connect_click(filename->ext, _filename_press, NULL, filename);
GtkGestureSingle *g_ext = dt_gui_connect_click(filename->ext, _filename_press, NULL, filename);
gtk_gesture_single_set_button(g_ext, GDK_BUTTON_SECONDARY);
gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER(g_ext), GTK_PHASE_TARGET);
if(top)
{
dt_gui_add_class(hb, "dt_quick_filter");
Expand Down
9 changes: 6 additions & 3 deletions src/libs/filters/misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,9 @@ static void _misc_press(GtkGestureSingle *gesture,
_widgets_misc_t *misc)
{
GtkWidget *w = dt_gui_get_widget(gesture);
const guint button = gtk_gesture_single_get_current_button(gesture);

if(gtk_gesture_single_get_current_button(gesture) == GDK_BUTTON_SECONDARY)
if(button == GDK_BUTTON_SECONDARY)
{
_misc_tree_update_visibility(w, misc);
gtk_popover_set_default_widget(GTK_POPOVER(misc->pop), w);
Expand All @@ -280,7 +281,7 @@ static void _misc_press(GtkGestureSingle *gesture,

gtk_widget_show_all(misc->pop);
}
else if(gtk_gesture_single_get_current_button(gesture) == GDK_BUTTON_PRIMARY
else if(button == GDK_BUTTON_PRIMARY
&& n_press >= 2)
{
gtk_entry_set_text(GTK_ENTRY(misc->name), "");
Expand Down Expand Up @@ -462,7 +463,9 @@ static void _misc_widget_init(dt_lib_filtering_rule_t *rule,
gtk_box_pack_start(GTK_BOX(hb), misc->name, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(misc->name), "activate", G_CALLBACK(_misc_changed), misc);
g_signal_connect(G_OBJECT(misc->name), "focus-out-event", G_CALLBACK(_misc_focus_out), misc);
dt_gui_connect_click(misc->name, _misc_press, NULL, misc);
GtkGestureSingle *misc_gesture = dt_gui_connect_click(misc->name, _misc_press, NULL, misc);
gtk_gesture_single_set_button(misc_gesture, GDK_BUTTON_SECONDARY);
gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER(misc_gesture), GTK_PHASE_TARGET);

if(top)
{
Expand Down
Loading