diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2017-08-17 20:29:50 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2017-08-17 20:32:59 +0300 |
| commit | e3c2edb363cdc2e6c1cbf27a80aa7205e1d47396 (patch) | |
| tree | 520a823367a62047e74f918d18f905ea8dcb846f | |
| parent | d358aa3bc029988f2b6390e50d745eb1e884f685 (diff) | |
| download | nautilus-wip/csoriano/list-box.tar.gz | |
Get the view to a working statewip/csoriano/list-box
| -rw-r--r-- | src/nautilus-icon-info.h | 2 | ||||
| -rw-r--r-- | src/nautilus-view-item-model.c | 6 | ||||
| -rw-r--r-- | src/nautilus-view-list-controller.c | 19 |
3 files changed, 21 insertions, 6 deletions
diff --git a/src/nautilus-icon-info.h b/src/nautilus-icon-info.h index 592b534d3..d71d6da48 100644 --- a/src/nautilus-icon-info.h +++ b/src/nautilus-icon-info.h @@ -45,6 +45,8 @@ typedef enum { #define NAUTILUS_CANVAS_ICON_SIZE_LARGER 128 #define NAUTILUS_CANVAS_ICON_SIZE_LARGEST 256 +#define NAUTILUS_ICON_MINIMUM_SIZE NAUTILUS_LIST_ICON_SIZE_SMALL +#define NAUTILUS_ICON_DEFAULT_SIZE NAUTILUS_CANVAS_ICON_SIZE_STANDARD /* Maximum size of an icon that the icon factory will ever produce */ #define NAUTILUS_ICON_MAXIMUM_SIZE 320 diff --git a/src/nautilus-view-item-model.c b/src/nautilus-view-item-model.c index e50f2d800..d51ce4bc2 100644 --- a/src/nautilus-view-item-model.c +++ b/src/nautilus-view-item-model.c @@ -116,9 +116,9 @@ nautilus_view_item_model_class_init (NautilusViewItemModelClass *klass) g_param_spec_int ("icon-size", "Icon size", "The size in pixels of the icon", - NAUTILUS_CANVAS_ICON_SIZE_SMALL, - NAUTILUS_CANVAS_ICON_SIZE_LARGEST, - NAUTILUS_CANVAS_ICON_SIZE_LARGE, + NAUTILUS_ICON_MINIMUM_SIZE, + NAUTILUS_ICON_MAXIMUM_SIZE, + NAUTILUS_ICON_DEFAULT_SIZE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, PROP_FILE, diff --git a/src/nautilus-view-list-controller.c b/src/nautilus-view-list-controller.c index 23fc94aee..d92647546 100644 --- a/src/nautilus-view-list-controller.c +++ b/src/nautilus-view-list-controller.c @@ -283,7 +283,7 @@ real_get_selection (NautilusFilesView *files_view) g_autoptr (GList) selected_items = NULL; self = NAUTILUS_VIEW_LIST_CONTROLLER (files_view); - selected_items = gtk_flow_box_get_selected_children (GTK_FLOW_BOX (self->view_ui)); + selected_items = gtk_list_box_get_selected_rows (GTK_LIST_BOX (self->view_ui)); for (l = selected_items; l != NULL; l = l->next) { NautilusViewItemModel *item_model; @@ -564,6 +564,18 @@ real_get_zoom_level_percentage (NautilusFilesView *files_view) } static gboolean +real_is_zoom_level_default (NautilusFilesView *files_view) +{ + NautilusViewListController *self; + guint icon_size; + + self = NAUTILUS_VIEW_LIST_CONTROLLER (files_view); + icon_size = get_icon_size_for_zoom_level (self->zoom_level); + + return icon_size == NAUTILUS_LIST_ICON_SIZE_STANDARD; +} + +static gboolean real_can_zoom_in (NautilusFilesView *files_view) { return TRUE; @@ -627,8 +639,8 @@ on_button_press_event (GtkWidget *widget, /* Need to update the selection so the popup has the right actions enabled */ selection = nautilus_view_get_selection (NAUTILUS_VIEW (self)); - child_at_pos = GTK_WIDGET (gtk_flow_box_get_child_at_pos (GTK_FLOW_BOX (self->view_ui), - event_button->x, event_button->y)); + child_at_pos = GTK_WIDGET (gtk_list_box_get_row_at_y (GTK_LIST_BOX (self->view_ui), + event_button->y)); if (child_at_pos != NULL) { NautilusFile *selected_file; @@ -903,6 +915,7 @@ nautilus_view_list_controller_class_init (NautilusViewListControllerClass *klass files_view_class->select_first = real_select_first; files_view_class->restore_standard_zoom_level = real_restore_standard_zoom_level; files_view_class->get_zoom_level_percentage = real_get_zoom_level_percentage; + files_view_class->is_zoom_level_default = real_is_zoom_level_default; files_view_class->compute_rename_popover_pointing_to = real_compute_rename_popover_pointing_to; } |