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

Fix misalignment of RTL text in ellipsized GtkLabel: use layout width if

Browse Source 
2006-01-23  Behdad Esfahbod  <behdad@gnome.org>

        * gtk/gtklabel.c (get_layout_location): Fix misalignment of RTL
        text in ellipsized GtkLabel: use layout width if set, otherwise
        fallback to ink extents width. (#322042)
This commit is contained in:
Behdad Esfahbod 2006-01-23 20:00:02 +00:00 committed by Behdad Esfahbod
parent 2ffe24ca11
commit 5d80e4b65c
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-23 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtklabel.c (get_layout_location): Fix misalignment of RTL
text in ellipsized GtkLabel: use layout width if set, otherwise
fallback to ink extents width. (#322042)
2006-01-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkassistant.c (compute_last_button_state): Only show the

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2006-01-23 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtklabel.c (get_layout_location): Fix misalignment of RTL
text in ellipsized GtkLabel: use layout width if set, otherwise
fallback to ink extents width. (#322042)
2006-01-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkassistant.c (compute_last_button_state): Only show the

14
gtk/gtklabel.c
View File

@ -2220,11 +2220,19 @@ get_layout_location (GtkLabel *label,
if (label->ellipsize || priv->width_chars > 0)
{
int width;
PangoRectangle ink_rect;
pango_layout_get_extents (label->layout, &ink_rect, NULL);
req_width = PANGO_PIXELS (ink_rect.width);
width = pango_layout_get_width (label->layout);
if (width == -1)
{
pango_layout_get_extents (label->layout, &ink_rect, NULL);
req_width = PANGO_PIXELS (ink_rect.width);
}
else
{
req_width = PANGO_PIXELS (width);
}
}
else
req_width = widget->requisition.width;

2
tests/.cvsignore
View File

@ -14,8 +14,10 @@ pixbuf-read
pixbuf-threads
simple
stresstest-toolbar
floatingtest
testactions
testaccel
testassistang
testcairo
testcalendar
testcellrenderertext