projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d2bd28
)
Evas textblock: Fixed min size calculation with right aligned paragraphs.
author
Tom Hacohen
<tom@stosb.com>
Thu, 2 Jun 2011 14:02:31 +0000
(14:02 +0000)
committer
Tom Hacohen
<tom@stosb.com>
Thu, 2 Jun 2011 14:02:31 +0000
(14:02 +0000)
SVN revision: 59899
legacy/evas/src/lib/canvas/evas_object_textblock.c
patch
|
blob
|
history
diff --git
a/legacy/evas/src/lib/canvas/evas_object_textblock.c
b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index
604343c
..
7ccc369
100644
(file)
--- a/
legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/
legacy/evas/src/lib/canvas/evas_object_textblock.c
@@
-2479,16
+2479,16
@@
loop_advance:
c->ln->x = c->marginl + c->o->style_pad.l;
}
+ c->par->h = c->ln->y + c->ln->h;
+ if (c->ln->w > c->par->w)
+ c->par->w = c->ln->w;
+
{
- Evas_Coord new_wmax = c->
ln->x + c->ln
->w +
+ Evas_Coord new_wmax = c->
par
->w +
c->marginl + c->marginr - (c->o->style_pad.l + c->o->style_pad.r);
if (new_wmax > c->wmax)
c->wmax = new_wmax;
}
-
- c->par->h = c->ln->y + c->ln->h;
- if (c->ln->w + c->ln->x > c->par->w)
- c->par->w = c->ln->x + c->ln->w;
}
/**