summaryrefslogtreecommitdiff
path: root/src/nautilus-list-model.c
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2016-02-10 09:56:17 +0100
committerCarlos Soriano <csoriano@gnome.org>2016-02-24 11:15:02 +0100
commitfd21c947cce5f9140aee4ae4abb9ac6914bdc0d2 (patch)
tree2c487b509875de7d9adc715716d228bdfd002705 /src/nautilus-list-model.c
parente4b0601b6f5d51a9633580f80dd67ea8b28ad8c0 (diff)
downloadnautilus-fd21c947cce5f9140aee4ae4abb9ac6914bdc0d2.tar.gz
general: add another zoom level
In icon view, add a smaller zoom level to be able for dense views, and increase the default padding to allow the labels enough space. Now levels are 48px, 64px, 96px and 128px for icon view, instead of only 64px, 96px and 128px, but with the increased padding the 64px and 48px are useful. List view also gains a bigger level, and they become 16px, 32px, 48px, 64px. Also, adjust the label max width to be larger, but inside the icon itself. This fixes the label not taking advantage of all the width the icon provides, and also a few cases where icons were misaligned.
Diffstat (limited to 'src/nautilus-list-model.c')
-rw-r--r--src/nautilus-list-model.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c
index c7eb2c1fe..14656d821 100644
--- a/src/nautilus-list-model.c
+++ b/src/nautilus-list-model.c
@@ -147,6 +147,7 @@ nautilus_list_model_get_column_type (GtkTreeModel *tree_model, int index)
case NAUTILUS_LIST_MODEL_SMALL_ICON_COLUMN:
case NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN:
case NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN:
return CAIRO_GOBJECT_TYPE_SURFACE;
case NAUTILUS_LIST_MODEL_FILE_NAME_IS_EDITABLE_COLUMN:
return G_TYPE_BOOLEAN;
@@ -257,6 +258,8 @@ nautilus_list_model_get_icon_size_for_zoom_level (NautilusListZoomLevel zoom_lev
return NAUTILUS_LIST_ICON_SIZE_STANDARD;
case NAUTILUS_LIST_ZOOM_LEVEL_LARGE:
return NAUTILUS_LIST_ICON_SIZE_LARGE;
+ case NAUTILUS_LIST_ZOOM_LEVEL_LARGER:
+ return NAUTILUS_LIST_ICON_SIZE_LARGER;
}
g_return_val_if_reached (NAUTILUS_LIST_ICON_SIZE_STANDARD);
}
@@ -296,6 +299,7 @@ nautilus_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int
case NAUTILUS_LIST_MODEL_SMALL_ICON_COLUMN:
case NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN:
case NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN:
+ case NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN:
g_value_init (value, CAIRO_GOBJECT_TYPE_SURFACE);
if (file != NULL) {
@@ -1256,6 +1260,8 @@ nautilus_list_model_get_zoom_level_from_column_id (int column)
return NAUTILUS_LIST_ZOOM_LEVEL_STANDARD;
case NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN:
return NAUTILUS_LIST_ZOOM_LEVEL_LARGE;
+ case NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN:
+ return NAUTILUS_LIST_ZOOM_LEVEL_LARGER;
}
g_return_val_if_reached (NAUTILUS_LIST_ZOOM_LEVEL_STANDARD);
@@ -1271,6 +1277,8 @@ nautilus_list_model_get_column_id_from_zoom_level (NautilusListZoomLevel zoom_le
return NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN;
case NAUTILUS_LIST_ZOOM_LEVEL_LARGE:
return NAUTILUS_LIST_MODEL_LARGE_ICON_COLUMN;
+ case NAUTILUS_LIST_ZOOM_LEVEL_LARGER:
+ return NAUTILUS_LIST_MODEL_LARGER_ICON_COLUMN;
}
g_return_val_if_reached (NAUTILUS_LIST_MODEL_STANDARD_ICON_COLUMN);