Commit 629fa925 authored by Christian Neumair's avatar Christian Neumair Committed by Christian Neumair

Obey one-line constraint in compact mode.

2008-08-17  Christian Neumair  <cneumair@gnome.org>

	* libnautilus-private/nautilus-icon-canvas-item.c
	(draw_or_measure_label_text):
	Obey one-line constraint in compact mode.

svn path=/trunk/; revision=14484
parent 5704ecfd
2008-08-17 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-icon-canvas-item.c
(draw_or_measure_label_text):
Obey one-line constraint in compact mode.
2008-08-16 Christian Neumair <cneumair@gnome.org>
* src/nautilus-navigation-window.c (real_sync_zoom_widgets):
......
......@@ -1010,6 +1010,9 @@ layout_get_full_size (PangoLayout *layout,
}
}
#define IS_COMPACT_VIEW(container) \
container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R && \
container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE
static void
draw_or_measure_label_text (NautilusIconCanvasItem *item,
......@@ -1095,9 +1098,11 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
if (have_editable) {
editable_layout = get_label_layout (&details->editable_text_layout, item, details->editable_text);
if (needs_highlight ||
details->is_prelit ||
container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
if (IS_COMPACT_VIEW (container)) {
pango_layout_set_height (editable_layout, -1);
} else if (needs_highlight ||
details->is_prelit ||
container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
/* VOODOO-TODO, cf. compute_text_rectangle() */
pango_layout_set_height (editable_layout, G_MININT);
} else {
......@@ -1899,10 +1904,6 @@ nautilus_icon_canvas_item_draw (EelCanvasItem *item, GdkDrawable *drawable,
(g_ascii_isdigit (*(p+1)) && \
g_ascii_isdigit (*(p+2))))
#define IS_COMPACT_VIEW(container) \
container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R && \
container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE
static PangoLayout *
create_label_layout (NautilusIconCanvasItem *item,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment