Re: [E-devel] E SVN: raster trunk/edje/src/lib
Hmmm, timing ?
Suspect
small/large...all the same..
dH
[EMAIL PROTECTED] wrote:
Author: raster
Date: 2008-09-09 23:39:57 -0700 (Tue, 09 Sep 2008)
New Revision: 35922
Modified:
trunk/edje/src/lib/edje_calc.c trunk/edje/src/lib/edje_private.h
trunk/edje/src/lib/edje_util.c
Log:
fix scaling on edje_scale - works with smnall sizes now too. problem is
really i was chasing a freeze/thaw problem. something is up.
Modified: trunk/edje/src/lib/edje_calc.c
===
--- trunk/edje/src/lib/edje_calc.c2008-09-10 05:47:13 UTC (rev 35921)
+++ trunk/edje/src/lib/edje_calc.c2008-09-10 06:39:57 UTC (rev 35922)
@@ -138,9 +138,13 @@
{
int i;
- if (!ed-dirty) return;
- if (ed-freeze)
+ if (!ed-dirty)
{
+ return;
+ }
+ if ((ed-freeze 0) || (_edje_freeze_val 0))
+ {
+ _edje_freeze_calc_count++;
ed-recalc = 1;
if (!ed-calc_only) return;
}
@@ -257,45 +261,79 @@
// if (flags FLAG_X)
{
minw = desc-min.w;
- if (ep-swallow_params.min.w desc-min.w) minw =
ep-swallow_params.min.w;
+ if (ep-part-scale) minw = (int)(((double)minw) * _edje_scale);
+ if (ep-swallow_params.min.w desc-min.w)
+ minw = ep-swallow_params.min.w;
/* XXX TODO: remove need of EDJE_INF_MAX_W, see edje_util.c */
if ((ep-swallow_params.max.w = 0) ||
(ep-swallow_params.max.w == EDJE_INF_MAX_W))
- maxw = desc-max.w;
+ {
+ maxw = desc-max.w;
+ if (maxw 0)
+{
+ if (ep-part-scale) maxw = (int)(((double)maxw) *
_edje_scale);
+ if (maxw 1) maxw = 1;
+}
+ }
else
{
if (desc-max.w = 0)
maxw = ep-swallow_params.max.w;
else
-maxw = MIN(ep-swallow_params.max.w, desc-max.w);
+{
+ maxw = desc-max.w;
+ if (maxw 0)
+ {
+if (ep-part-scale) maxw = (int)(((double)maxw) *
_edje_scale);
+if (maxw 1) maxw = 1;
+ }
+ if (ep-swallow_params.max.w maxw)
+ maxw = ep-swallow_params.max.w;
+}
}
- if (ep-part-scale)
+ if (maxw = 0)
{
- minw *= _edje_scale;
- maxw *= _edje_scale;
+ if (maxw minw) maxw = minw;
}
}
// if (flags FLAG_Y)
{
minh = desc-min.h;
- if (ep-swallow_params.min.h desc-min.h) minh =
ep-swallow_params.min.h;
+ if (ep-part-scale) minh = (int)(((double)minh) * _edje_scale);
+ if (ep-swallow_params.min.h desc-min.h)
+ minh = ep-swallow_params.min.h;
/* XXX TODO: remove need of EDJE_INF_MAX_H, see edje_util.c */
if ((ep-swallow_params.max.h = 0) ||
(ep-swallow_params.max.h == EDJE_INF_MAX_H))
- maxh = desc-max.h;
+ {
+ maxh = desc-max.h;
+ if (maxh 0)
+{
+ if (ep-part-scale) maxh = (int)(((double)maxh) *
_edje_scale);
+ if (maxh 1) maxh = 1;
+}
+ }
else
{
if (desc-max.h = 0)
maxh = ep-swallow_params.max.h;
else
-maxh = MIN(ep-swallow_params.max.h, desc-max.h);
+{
+ maxh = desc-max.h;
+ if (maxh 0)
+ {
+if (ep-part-scale) maxh = (int)(((double)maxh) *
_edje_scale);
+if (maxh 1) maxh = 1;
+ }
+ if (ep-swallow_params.max.h maxh)
+ maxh = ep-swallow_params.max.h;
+}
}
- if (ep-part-scale)
+ if (maxh = 0)
{
- minh *= _edje_scale;
- maxh *= _edje_scale;
+ if (maxh minh) maxh = minh;
}
}
/* relative coords of top left bottom right */
Modified: trunk/edje/src/lib/edje_private.h
===
--- trunk/edje/src/lib/edje_private.h 2008-09-10 05:47:13 UTC (rev 35921)
+++ trunk/edje/src/lib/edje_private.h 2008-09-10 06:39:57 UTC (rev 35922)
@@ -1004,6 +1004,8 @@
extern char*_edje_fontset_append;
extern double _edje_scale;
+extern int _edje_freeze_val;
+extern int _edje_freeze_calc_count;
void _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, double pos);
Edje_Part_Description *_edje_part_description_find(Edje *ed, Edje_Real_Part
*rp, const char *name, double val);
Modified: trunk/edje/src/lib/edje_util.c
===
--- trunk/edje/src/lib/edje_util.c2008-09-10 05:47:13 UTC (rev 35921)
+++ trunk/edje/src/lib/edje_util.c2008-09-10 06:39:57 UTC (rev
Re: [E-devel] E SVN: raster trunk/e/src/bin
more eyes on the scale please dh [EMAIL PROTECTED] wrote: Author: raster Date: 2008-09-09 21:34:42 -0700 (Tue, 09 Sep 2008) New Revision: 35915 Modified: trunk/e/src/bin/e_canvas.c Log: commented out.. scale testing! Modified: trunk/e/src/bin/e_canvas.c === --- trunk/e/src/bin/e_canvas.c2008-09-10 04:33:57 UTC (rev 35914) +++ trunk/e/src/bin/e_canvas.c2008-09-10 04:34:42 UTC (rev 35915) @@ -39,6 +39,8 @@ } else if (e_config-font_hinting == 2) evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); +// FIXME: testing. +// edje_scale_set(2.0); } EAPI void - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-svn mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-svn - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E SVN: raster trunk/evas/src/lib/canvas
fp...better for a scale...more precision
dh
[EMAIL PROTECTED] wrote:
Author: raster
Date: 2008-09-09 23:40:54 -0700 (Tue, 09 Sep 2008)
New Revision: 35924
Modified:
trunk/evas/src/lib/canvas/evas_object_text.c
trunk/evas/src/lib/canvas/evas_object_textblock.c
Log:
ensure scaling multiplies are promoted to fp.
Modified: trunk/evas/src/lib/canvas/evas_object_text.c
===
--- trunk/evas/src/lib/canvas/evas_object_text.c 2008-09-10 06:40:24 UTC
(rev 35923)
+++ trunk/evas/src/lib/canvas/evas_object_text.c 2008-09-10 06:40:54 UTC
(rev 35924)
@@ -191,7 +191,6 @@
evas_font_free(obj-layer-evas, o-engine_data);
o-engine_data = NULL;
}
- o-engine_data = evas_font_load(obj-layer-evas, font, o-cur.source,
(int)(((double)size) * obj-cur.scale));
if (!same_font)
{
if (o-cur.font) evas_stringshare_del(o-cur.font);
@@ -200,6 +199,8 @@
o-prev.font = NULL;
}
o-cur.size = size;
+ o-engine_data = evas_font_load(obj-layer-evas, o-cur.font,
o-cur.source,
+(int)(((double)o-cur.size) *
obj-cur.scale));
evas_text_style_pad_get(o-cur.style, l, r, t, b);
if ((o-engine_data) (o-cur.text))
{
Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c
===
--- trunk/evas/src/lib/canvas/evas_object_textblock.c 2008-09-10 06:40:24 UTC
(rev 35923)
+++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2008-09-10 06:40:54 UTC
(rev 35924)
@@ -1168,6 +1168,7 @@
}
else if (fmt-font.name)
buf = strdup(fmt-font.name);
+
fmt-font.font = evas_font_load(obj-layer-evas,
buf, fmt-font.source,
(int)(((double)fmt-font.size) *
obj-cur.scale));
@@ -1290,7 +1291,7 @@
else if (fmt2-font.name)
buf = strdup(fmt2-font.name);
fmt2-font.font = evas_font_load(obj-layer-evas,
-buf, fmt2-font.source,
+ buf, fmt2-font.source,
(int)(((double)fmt2-font.size) *
obj-cur.scale));
if (buf) free(buf);
return fmt2;
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-svn mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Copying bugs from Bugzilla to Trac
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I decide to dedicate a piece of my time to move(copy) bugs from bugzilla to trac, as requested. There's someone more privileged than me that could fill the component list on trac for missing entries? Thx Massimiliano - -- Massimiliano Calamelli http://mcalamelli.netsons.org [EMAIL PROTECTED] -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.7 (MingW32) iD8DBQFIx7LhleGEL56NNP4RAvzQAJ0SGgoja08rKAfkpqSnsxLN1DvTZQCfRwbB cGqniG8cfvqZMH4snW53Ym0= =fymU -END PGP SIGNATURE- - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Copying bugs from Bugzilla to Trac
Nice one! Im going to jump into the fray in a sec and send a few across. I threw this out last night to get anyone willing to lend a hand with a few bugs. http://trac.enlightenment.org/e/blog Toma 2008/9/10 Massimiliano Calamelli [EMAIL PROTECTED]: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I decide to dedicate a piece of my time to move(copy) bugs from bugzilla to trac, as requested. There's someone more privileged than me that could fill the component list on trac for missing entries? Thx Massimiliano - -- Massimiliano Calamelli http://mcalamelli.netsons.org [EMAIL PROTECTED] -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.7 (MingW32) iD8DBQFIx7LhleGEL56NNP4RAvzQAJ0SGgoja08rKAfkpqSnsxLN1DvTZQCfRwbB cGqniG8cfvqZMH4snW53Ym0= =fymU -END PGP SIGNATURE- - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] LightMediaScanner repository moved
Hi guys, I moved LightMediaScanner and its python bindings from staff.get-e.org to: Web Interface: http://gitweb.profusion.mobi(or http://local.profusion.mobi:8081/) Git Protocol: git clone git://git.profusion.mobi/ + project -- Gustavo Sverzut Barbieri http://profusion.mobi embedded systems -- MSN: [EMAIL PROTECTED] Skype: gsbarbieri Mobile: +55 (19) 9225-2202 - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
