summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2015-01-21 17:45:19 -0800
committerCarlos Soriano <csoriano@gnome.org>2015-01-24 02:06:05 +0100
commit8b53911af454e9ceabf6425fa88a352c4e4286f2 (patch)
tree58546aa8f724fe6450b6879766cc20f23e9174b6
parent70bb20ff25a1693c19fd53cab5f545be7a98834f (diff)
downloadnautilus-8b53911af454e9ceabf6425fa88a352c4e4286f2.tar.gz
canvas-item: change the maximum text size at standard zoom
To match mockups.
-rw-r--r--libnautilus-private/nautilus-canvas-item.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-canvas-item.c b/libnautilus-private/nautilus-canvas-item.c
index 11d85a2a9..a6cf99c9b 100644
--- a/libnautilus-private/nautilus-canvas-item.c
+++ b/libnautilus-private/nautilus-canvas-item.c
@@ -49,9 +49,13 @@
#define LABEL_OFFSET 1
#define LABEL_LINE_SPACING 0
+/* Text padding */
+#define TEXT_BACK_PADDING_X 4
+#define TEXT_BACK_PADDING_Y 1
+
/* 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 110
+#define MAX_TEXT_WIDTH_STANDARD (134 - 2 * TEXT_BACK_PADDING_X)
/* special text height handling
* each item has three text height variables:
@@ -670,9 +674,6 @@ layout_get_size_for_layout (PangoLayout *layout,
}
}
-#define TEXT_BACK_PADDING_X 4
-#define TEXT_BACK_PADDING_Y 1
-
static void
prepare_pango_layout_width (NautilusCanvasItem *item,
PangoLayout *layout)