aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje/edje_util.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-11 12:10:32 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-11 12:10:32 +0900
commit75daddc83999403c74cab7b1ed1f8fc3405fd025 (patch)
tree4e13c65381abbbec7ab7f3c412d6e874075bbeda /src/lib/edje/edje_util.c
parentevil: add tests for Windows port. (diff)
downloadefl-75daddc83999403c74cab7b1ed1f8fc3405fd025.tar.gz
Revert "Edje: use textblock by default"
This reverts commit ef3d2120bfa58f9247a441602bd30f13cc7f225a. This breaks E. pager ono my right screen looks like: http://devs.enlightenment.org/~raster/shot-2017-11-11_12-13-14.png on my left screen shellf keeps swapping between 2 dizes wobbling back and forth every frame eating cpu and making it "blurry"... note - theme is the flat one in devs/raster/theme/flat2 branch. so this change certainly breaks something...
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_util.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index deea92545b..da5c3cb069 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -2078,7 +2078,7 @@ _edje_efl_text_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part,
return desc->text.text.str;
}
}
- else
+ if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
{
const char *entry;
if (legacy)
@@ -3496,7 +3496,7 @@ again:
//width
if (!ep->chosen_description->fixed.w)
{
- if ((legacy_calc) && PART_IS_TEXT(ed, ep))
+ if ((legacy_calc) && (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
{
//We care textblock width size specially.
Evas_Coord tb_mw;
@@ -3524,8 +3524,9 @@ again:
{
if (legacy_calc)
{
- if (!PART_IS_TEXT(ed, ep) ||
- ((Edje_Part_Description_Text *)ep->chosen_description)->text.min_x || !skip_h)
+ if ((ep->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
+ ((Edje_Part_Description_Text *)ep->chosen_description)->text.min_x ||
+ !skip_h)
{
if (over_h > max_over_h)
{
@@ -3535,7 +3536,7 @@ again:
}
}
- if (PART_IS_TEXT(ed, ep))
+ if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
has_fixed_tb = EINA_FALSE;
}
else if (over_h > max_over_h)