diff options
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-canvas-container.c | 8 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-canvas-item.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-info.h | 14 |
4 files changed, 16 insertions, 10 deletions
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c index e3d0bd79a..65d73f6e5 100644 --- a/libnautilus-private/nautilus-canvas-container.c +++ b/libnautilus-private/nautilus-canvas-container.c @@ -98,7 +98,7 @@ * where a 76px canvas item would only take one. * Canvas items are then centered in the extra available space. */ -#define STANDARD_ICON_GRID_WIDTH 80 +#define STANDARD_ICON_GRID_WIDTH 145 /* Desktop layout mode defines */ #define DESKTOP_PAD_HORIZONTAL 10 @@ -355,6 +355,8 @@ nautilus_canvas_container_get_icon_size_for_zoom_level (NautilusCanvasZoomLevel return NAUTILUS_CANVAS_ICON_SIZE_STANDARD; case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE: return NAUTILUS_CANVAS_ICON_SIZE_LARGE; + case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER: + return NAUTILUS_CANVAS_ICON_SIZE_LARGER; } g_return_val_if_reached (NAUTILUS_CANVAS_ICON_SIZE_STANDARD); } @@ -6255,8 +6257,8 @@ nautilus_canvas_container_set_zoom_level (NautilusCanvasContainer *container, in pinned_level = new_level; if (pinned_level < NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL) { pinned_level = NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL; - } else if (pinned_level > NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE) { - pinned_level = NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE; + } else if (pinned_level > NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER) { + pinned_level = NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER; } if (pinned_level == details->zoom_level) { diff --git a/libnautilus-private/nautilus-canvas-item.c b/libnautilus-private/nautilus-canvas-item.c index 318eb5329..426044b02 100644 --- a/libnautilus-private/nautilus-canvas-item.c +++ b/libnautilus-private/nautilus-canvas-item.c @@ -55,7 +55,7 @@ /* Width of the label with the standard icon size NAUTILUS_CANVAS_ICON_SIZE_STANDARD. * It will adapt to other sizes keeping the same space.*/ -#define MAX_TEXT_WIDTH_STANDARD (134 - 2 * TEXT_BACK_PADDING_X) +#define MAX_TEXT_WIDTH_STANDARD (142 - 2 * TEXT_BACK_PADDING_X) /* special text height handling * each item has three text height variables: diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index fd70c7b28..358dfb40c 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -3561,7 +3561,7 @@ thumbnail_loader_size_prepared (GdkPixbufLoader *loader, aspect_ratio = ((double) width) / height; /* cf. nautilus_file_get_icon() */ - max_thumbnail_size = NAUTILUS_CANVAS_ICON_SIZE_LARGE * cached_thumbnail_size / NAUTILUS_CANVAS_ICON_SIZE_SMALL; + max_thumbnail_size = NAUTILUS_CANVAS_ICON_SIZE_LARGER * cached_thumbnail_size / NAUTILUS_CANVAS_ICON_SIZE_SMALL; if (MAX (width, height) > max_thumbnail_size) { if (width > height) { width = max_thumbnail_size; diff --git a/libnautilus-private/nautilus-icon-info.h b/libnautilus-private/nautilus-icon-info.h index 437d352b3..557588f2c 100644 --- a/libnautilus-private/nautilus-icon-info.h +++ b/libnautilus-private/nautilus-icon-info.h @@ -14,16 +14,18 @@ typedef enum { NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL, NAUTILUS_CANVAS_ZOOM_LEVEL_STANDARD, NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE, + NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER, } NautilusCanvasZoomLevel; typedef enum { NAUTILUS_LIST_ZOOM_LEVEL_SMALL, NAUTILUS_LIST_ZOOM_LEVEL_STANDARD, NAUTILUS_LIST_ZOOM_LEVEL_LARGE, + NAUTILUS_LIST_ZOOM_LEVEL_LARGER, } NautilusListZoomLevel; -#define NAUTILUS_LIST_ZOOM_LEVEL_N_ENTRIES (NAUTILUS_LIST_ZOOM_LEVEL_LARGE + 1) -#define NAUTILUS_CANVAS_ZOOM_LEVEL_N_ENTRIES (NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE + 1) +#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) /* Nominal icon sizes for each Nautilus zoom level. * This scheme assumes that icons are designed to @@ -34,10 +36,12 @@ typedef enum { #define NAUTILUS_LIST_ICON_SIZE_SMALL 16 #define NAUTILUS_LIST_ICON_SIZE_STANDARD 32 #define NAUTILUS_LIST_ICON_SIZE_LARGE 48 +#define NAUTILUS_LIST_ICON_SIZE_LARGER 64 -#define NAUTILUS_CANVAS_ICON_SIZE_SMALL 64 -#define NAUTILUS_CANVAS_ICON_SIZE_STANDARD 96 -#define NAUTILUS_CANVAS_ICON_SIZE_LARGE 128 +#define NAUTILUS_CANVAS_ICON_SIZE_SMALL 48 +#define NAUTILUS_CANVAS_ICON_SIZE_STANDARD 64 +#define NAUTILUS_CANVAS_ICON_SIZE_LARGE 94 +#define NAUTILUS_CANVAS_ICON_SIZE_LARGER 128 /* Maximum size of an icon that the icon factory will ever produce */ #define NAUTILUS_ICON_MAXIMUM_SIZE 320 |