[nautilus] view-icon: add new zoom level
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] view-icon: add new zoom level
- Date: Wed, 15 Feb 2017 00:28:09 +0000 (UTC)
commit 1e5eba1d7c0c660ae1268679ec2d69eabd8c1d85
Author: Carlos Soriano <csoriano gnome org>
Date: Wed Feb 15 01:10:37 2017 +0100
view-icon: add new zoom level
With the flow box we can finally add more zoom levels. Add a new larger
one so the user can view larger content.
data/org.gnome.nautilus.gschema.xml | 1 +
src/nautilus-directory-async.c | 2 +-
src/nautilus-icon-info.h | 4 +++-
src/nautilus-view-icon-controller.c | 8 +++++++-
src/nautilus-view-item-model.c | 2 +-
5 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/data/org.gnome.nautilus.gschema.xml b/data/org.gnome.nautilus.gschema.xml
index 24df7ec..405e5a2 100644
--- a/data/org.gnome.nautilus.gschema.xml
+++ b/data/org.gnome.nautilus.gschema.xml
@@ -37,6 +37,7 @@
<value value="1" nick="standard"/>
<value value="2" nick="large"/>
<value value="3" nick="larger"/>
+ <value value="4" nick="largest"/>
</enum>
<enum id="org.gnome.nautilus.ListZoomLevel">
diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c
index b02e3de..05e138a 100644
--- a/src/nautilus-directory-async.c
+++ b/src/nautilus-directory-async.c
@@ -3954,7 +3954,7 @@ thumbnail_loader_size_prepared (GdkPixbufLoader *loader,
aspect_ratio = ((double) width) / height;
/* cf. nautilus_file_get_icon() */
- max_thumbnail_size = NAUTILUS_CANVAS_ICON_SIZE_LARGER * cached_thumbnail_size /
NAUTILUS_CANVAS_ICON_SIZE_SMALL;
+ max_thumbnail_size = NAUTILUS_CANVAS_ICON_SIZE_LARGEST * cached_thumbnail_size /
NAUTILUS_CANVAS_ICON_SIZE_SMALL;
if (MAX (width, height) > max_thumbnail_size)
{
if (width > height)
diff --git a/src/nautilus-icon-info.h b/src/nautilus-icon-info.h
index f034ba8..592b534 100644
--- a/src/nautilus-icon-info.h
+++ b/src/nautilus-icon-info.h
@@ -15,6 +15,7 @@ typedef enum {
NAUTILUS_CANVAS_ZOOM_LEVEL_STANDARD,
NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE,
NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER,
+ NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST,
} NautilusCanvasZoomLevel;
typedef enum {
@@ -25,7 +26,7 @@ typedef enum {
} NautilusListZoomLevel;
#define NAUTILUS_LIST_ZOOM_LEVEL_N_ENTRIES (NAUTILUS_LIST_ZOOM_LEVEL_LARGER + 1)
-#define NAUTILUS_CANVAS_ZOOM_LEVEL_N_ENTRIES (NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER + 1)
+#define NAUTILUS_CANVAS_ZOOM_LEVEL_N_ENTRIES (NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST + 1)
/* Nominal icon sizes for each Nautilus zoom level.
* This scheme assumes that icons are designed to
@@ -42,6 +43,7 @@ typedef enum {
#define NAUTILUS_CANVAS_ICON_SIZE_STANDARD 64
#define NAUTILUS_CANVAS_ICON_SIZE_LARGE 96
#define NAUTILUS_CANVAS_ICON_SIZE_LARGER 128
+#define NAUTILUS_CANVAS_ICON_SIZE_LARGEST 256
/* Maximum size of an icon that the icon factory will ever produce */
#define NAUTILUS_ICON_MAXIMUM_SIZE 320
diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c
index ae8040e..507eb94 100644
--- a/src/nautilus-view-icon-controller.c
+++ b/src/nautilus-view-icon-controller.c
@@ -445,7 +445,7 @@ real_bump_zoom_level (NautilusFilesView *files_view,
new_level = self->zoom_level + zoom_increment;
if (new_level >= NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL &&
- new_level <= NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER)
+ new_level <= NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST)
{
g_action_group_change_action_state (self->action_group,
"zoom-to-level",
@@ -481,6 +481,12 @@ get_icon_size_for_zoom_level (NautilusCanvasZoomLevel zoom_level)
return NAUTILUS_CANVAS_ICON_SIZE_LARGER;
}
break;
+
+ case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST:
+ {
+ return NAUTILUS_CANVAS_ICON_SIZE_LARGEST;
+ }
+ break;
}
g_return_val_if_reached (NAUTILUS_CANVAS_ICON_SIZE_STANDARD);
}
diff --git a/src/nautilus-view-item-model.c b/src/nautilus-view-item-model.c
index 42f1911..970fb28 100644
--- a/src/nautilus-view-item-model.c
+++ b/src/nautilus-view-item-model.c
@@ -131,7 +131,7 @@ nautilus_view_item_model_class_init (NautilusViewItemModelClass *klass)
"Icon size",
"The size in pixels of the icon",
NAUTILUS_CANVAS_ICON_SIZE_SMALL,
- NAUTILUS_CANVAS_ICON_SIZE_LARGER,
+ NAUTILUS_CANVAS_ICON_SIZE_LARGEST,
NAUTILUS_CANVAS_ICON_SIZE_LARGE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]