Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gtk3_fix_chooser_dead_tilde_trigger_location' into 'gtk-3-24'

Browse Source 
Fix open location entry when pressing '~'

See merge request GNOME/gtk!4971
This commit is contained in:
Matthias Clasen
2022-12-13 13:00:36 +00:00
parent 3b9531d3d3 573636d84a
commit 2f6d0792f8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkfilechooserwidget.c
View File

@@ -1332,6 +1332,7 @@ should_trigger_location_entry (GtkFileChooserWidget *impl,
|| event->keyval == GDK_KEY_period
#ifdef G_OS_UNIX
|| event->keyval == GDK_KEY_asciitilde
|| event->keyval == GDK_KEY_dead_tilde
#endif
) && !(event->state & no_text_input_mask))
return TRUE;
@@ -1348,6 +1349,7 @@ browse_files_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
gpointer data)
{
gchar *path;
GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
GtkFileChooserWidgetPrivate *priv = impl->priv;
@@ -1358,7 +1360,8 @@ browse_files_key_press_event_cb (GtkWidget *widget,
(priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER))
{
location_popup_handler (impl, event->string);
path = event->keyval == GDK_KEY_dead_tilde ? "~" : event->string;
location_popup_handler (impl, path);
return TRUE;
}