gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-13 04:51:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix layouting in text-beside-icons mode for short names. (#159621) Patch

Browse source 
2005-08-26  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/nautilus-icon-container.c:
	(lay_down_icons_horizontal):
	Fix layouting in text-beside-icons mode for short names.
	(#159621)
	Patch from Christian Neumair  <chris@gnome-de.org>
This commit is contained in:
Alexander Larsson 2005-08-26 15:17:44 +00:00 committed by Alexander Larsson
parent b46aec4dd4
commit e826459a74
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-08-26 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-icon-container.c:
(lay_down_icons_horizontal):
Fix layouting in text-beside-icons mode for short names.
(#159621)
Patch from Christian Neumair <chris@gnome-de.org>
2005-08-25 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.[ch]:

21
libnautilus-private/nautilus-icon-container.c
View file

@ -978,6 +978,7 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
double line_width;
gboolean gridded_layout;
double grid_width;
double max_text_width, max_icon_width;
int icon_width;
int i;
@ -998,17 +999,23 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
- container->details->top_margin
- container->details->bottom_margin) / EEL_CANVAS (container)->pixels_per_unit;
max_icon_width = max_text_width = 0.0;
if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
grid_width = 0.0;
/* Would it be worth caching these bounds for the next loop? */
for (p = icons; p != NULL; p = p->next) {
icon = p->data;
eel_canvas_item_get_bounds (EEL_CANVAS_ITEM (icon->item),
&bounds.x0, &bounds.y0,
&bounds.x1, &bounds.y1);
grid_width = MAX (grid_width, ceil (bounds.x1 - bounds.x0) + ICON_PAD_LEFT + ICON_PAD_RIGHT);
icon_bounds = nautilus_icon_canvas_item_get_icon_rectangle (icon->item);
max_icon_width = MAX (max_icon_width, ceil (icon_bounds.x1 - icon_bounds.x0));
text_bounds = nautilus_icon_canvas_item_get_text_rectangle (icon->item);
max_text_width = MAX (max_text_width, ceil (text_bounds.x1 - text_bounds.x0 < 0
? MAX_TEXT_WIDTH_BESIDE
: text_bounds.x1 - text_bounds.x0));
}
grid_width = max_icon_width + max_text_width + ICON_PAD_LEFT + ICON_PAD_RIGHT;
} else {
grid_width = STANDARD_ICON_GRID_WIDTH;
}
@ -1093,7 +1100,7 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
if (gridded_layout) {
position->x_offset = icon_width - ((icon_bounds.x1 - icon_bounds.x0) + MAX_TEXT_WIDTH_BESIDE);
position->x_offset = max_icon_width + ICON_PAD_LEFT + ICON_PAD_RIGHT - (icon_bounds.x1 - icon_bounds.x0);
} else {
position->x_offset = icon_width - ((icon_bounds.x1 - icon_bounds.x0) + (text_bounds.x1 - text_bounds.x0));
}