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

GtkFileChooser: Make preview update more understandable

Browse Source 
Implement Federico's suggestion:
In single-selection mode, just use the selected row,
In multi-selection mode, use the cursor row as long as it is
in the selection.

https://bugzilla.gnome.org/show_bug.cgi?id=154709
This commit is contained in:
Matthias Clasen 2014-10-19 17:54:28 -04:00
parent 38b315d0be
commit f678e48a08
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkfilechooserwidget.c
View File

@ -501,6 +501,8 @@ static void list_row_activated (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,
GtkTreeViewColumn *column, GtkTreeViewColumn *column,
GtkFileChooserWidget *impl); GtkFileChooserWidget *impl);
static void list_cursor_changed (GtkTreeView *treeview,
GtkFileChooserWidget *impl);
static void path_bar_clicked (GtkPathBar *path_bar, static void path_bar_clicked (GtkPathBar *path_bar,
GFile *file, GFile *file,
@ -6571,24 +6573,45 @@ static void
check_preview_change (GtkFileChooserWidget *impl) check_preview_change (GtkFileChooserWidget *impl)
{ {
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
GtkTreePath *cursor_path; GtkTreePath *path;
GFile *new_file; GFile *new_file;
char *new_display_name; char *new_display_name;
GtkTreeModel *model; GtkTreeModel *model;
GtkTreeSelection *selection;
gtk_tree_view_get_cursor (GTK_TREE_VIEW (priv->browse_files_tree_view), &cursor_path, NULL);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->browse_files_tree_view)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->browse_files_tree_view));
if (cursor_path) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view));
if (gtk_tree_selection_get_mode (selection) == GTK_SELECTION_SINGLE ||
gtk_tree_selection_get_mode (selection) == GTK_SELECTION_BROWSE)
{ {
GtkTreeIter iter; GtkTreeIter iter;
gtk_tree_model_get_iter (model, &iter, cursor_path); if (gtk_tree_selection_get_selected (selection, NULL, &iter))
path = gtk_tree_model_get_path (model, &iter);
else
path = NULL;
}
else
{
gtk_tree_view_get_cursor (GTK_TREE_VIEW (priv->browse_files_tree_view), &path, NULL);
if (path && !gtk_tree_selection_path_is_selected (selection, path))
{
gtk_tree_path_free (path);
path = NULL;
}
}
if (path)
{
GtkTreeIter iter;
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_model_get (model, &iter, gtk_tree_model_get (model, &iter,
MODEL_COL_FILE, &new_file, MODEL_COL_FILE, &new_file,
MODEL_COL_NAME, &new_display_name, MODEL_COL_NAME, &new_display_name,
-1); -1);
gtk_tree_path_free (cursor_path); gtk_tree_path_free (path);
} }
else else
{ {
@ -6696,6 +6719,13 @@ list_selection_changed (GtkTreeSelection *selection,
g_signal_emit_by_name (impl, "selection-changed", 0); g_signal_emit_by_name (impl, "selection-changed", 0);
} }
static void
list_cursor_changed (GtkTreeView *list,
GtkFileChooserWidget *impl)
{
check_preview_change (impl);
}
/* Callback used when a row in the file list is activated */ /* Callback used when a row in the file list is activated */
static void static void
list_row_activated (GtkTreeView *tree_view, list_row_activated (GtkTreeView *tree_view,
@ -7382,6 +7412,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
gtk_widget_class_bind_template_callback (widget_class, list_row_activated); gtk_widget_class_bind_template_callback (widget_class, list_row_activated);
gtk_widget_class_bind_template_callback (widget_class, file_list_drag_motion_cb); gtk_widget_class_bind_template_callback (widget_class, file_list_drag_motion_cb);
gtk_widget_class_bind_template_callback (widget_class, list_selection_changed); gtk_widget_class_bind_template_callback (widget_class, list_selection_changed);
gtk_widget_class_bind_template_callback (widget_class, list_cursor_changed);
gtk_widget_class_bind_template_callback (widget_class, renderer_editing_canceled_cb); gtk_widget_class_bind_template_callback (widget_class, renderer_editing_canceled_cb);
gtk_widget_class_bind_template_callback (widget_class, renderer_edited_cb); gtk_widget_class_bind_template_callback (widget_class, renderer_edited_cb);
gtk_widget_class_bind_template_callback (widget_class, filter_combo_changed); gtk_widget_class_bind_template_callback (widget_class, filter_combo_changed);