mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-09-17 23:01:59 +00:00
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
This commit is contained in:
parent
5704ecfd89
commit
629fa9253e
|
@ -1,3 +1,9 @@
|
|||
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,7 +1098,9 @@ 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 ||
|
||||
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() */
|
||||
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue