AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 565203: RTL locales: icons are misplaced when horizontal gtkiconview

Browse Source 
2008-12-21  Yair Hershkovitz  <yairhr@gmail.com>

        Bug 565203: RTL locales: icons are misplaced when horizontal 
                    gtkiconview is contained in a gtkscrolledwindow.

        * gtk/gtkiconview.c (gtk_icon_view_layout_single_row):
        Fix horizontal icon positions when in RTL locale.

svn path=/trunk/; revision=21918
This commit is contained in:
Yair Hershkovitz 2008-12-21 08:10:53 +00:00 committed by Yair Hershkovitz
parent fa09d8bc71
commit 7404704431
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-12-21 Yair Hershkovitz <yairhr@gmail.com>
Bug 565203: RTL locales: icons are misplaced when horizontal
gtkiconview is contained in a gtkscrolledwindow.
* gtk/gtkiconview.c (gtk_icon_view_layout_single_row):
Fix horizontal icon positions when in RTL locale.
2008-12-19 Matthias Clasen <mclasen@redhat.com>
* NEWS: Update

11
gtk/gtkiconview.c
View File

@ -2575,7 +2575,7 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view,
current_width += icon_view->priv->column_spacing + 2 * focus_width;
item->y = *y + focus_width;
item->x = rtl ? GTK_WIDGET (icon_view)->allocation.width - item->width - x : x;
item->x = x;
x = current_width - (icon_view->priv->margin + focus_width);
@ -2599,14 +2599,17 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view,
{
GtkIconViewItem *item = items->data;
if (rtl)
{
item->x = *maximum_width - item->width - item->x;
item->col = col - 1 - item->col;
}
gtk_icon_view_calculate_item_size2 (icon_view, item, max_height);
/* We may want to readjust the new y coordinate. */
if (item->y + item->height + focus_width + icon_view->priv->row_spacing > *y)
*y = item->y + item->height + focus_width + icon_view->priv->row_spacing;
if (rtl)
item->col = col - 1 - item->col;
}
g_free (max_height);