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:
5c233f7
)
Edje entry: Fixed a fit issue with fitting even when disabled.
author
Tom Hacohen
<tom@stosb.com>
Tue, 19 Feb 2013 11:46:21 +0000
(11:46 +0000)
committer
Tom Hacohen
<tom@stosb.com>
Tue, 19 Feb 2013 11:46:21 +0000
(11:46 +0000)
src/lib/edje/edje_calc.c
patch
|
blob
|
history
diff --git
a/src/lib/edje/edje_calc.c
b/src/lib/edje/edje_calc.c
index
62a8580
..
5b1bf1d
100644
(file)
--- a/
src/lib/edje/edje_calc.c
+++ b/
src/lib/edje/edje_calc.c
@@
-1356,7
+1356,9
@@
_edje_part_recalc_single_textblock(FLOAT_T sc,
/* If we are still too big, try reducing the size to
* 95% each try. */
- while ((i > 0) && ((fw > params->w) || (fh > params->h)))
+ while ((i > 0) &&
+ ((chosen_desc->text.fit_x && (fw > params->w)) ||
+ (chosen_desc->text.fit_y && (fh > params->h))))
{
double tmp_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, s * 0.95);