Commit Graph

252 Commits

Author SHA1 Message Date
Cedric BAIL 881244542d edje: refactor code.
SVN revision: 63620
2011-09-27 06:16:34 +00:00
Daniel Juyung Seo f915dca8ae edje edje_calc.c: Removed warnings.
SVN revision: 62729
2011-08-23 16:44:36 +00:00
Gustavo Sverzut Barbieri cc1d1f95c6 change text's single recalc to use apply version.
Original _edje_part_recalc_single_text() was not working as
expected since it was not doing size fit, range, ellipsis and so
on.

The purpose of this function compared with
_edje_text_recalc_apply() is to be faster, not calling Evas update
functions. However for text this is quite difficult given that to
fit we need to set the font, size, style, etc. If it was done
correctly, we'd save some calls to move and some color sets,
however those shouldn't matter much in the overall picture.

I've changed this to force applying the value, it should be more
correct and not so slow. The previous code is kept below for
reference but should be removed before next release!




SVN revision: 62640
2011-08-21 01:38:17 +00:00
Carsten Haitzler 87985a16fa and when doing proxy.. lets calc the right proxy id part shall we?
SVN revision: 62630
2011-08-20 13:03:01 +00:00
Carsten Haitzler 64aa704c69 fix: if proxy id < 0 (invalid) disable proxy...!!! (yes i know -
backport. leaving for 1.1)



SVN revision: 62623
2011-08-20 07:27:52 +00:00
Cedric BAIL 5c95f8d422 edje: fix cache and proxy.
SVN revision: 62464
2011-08-14 21:55:31 +00:00
Rafael Antognolli e53adf4789 edje/perspective - Actually use the global perspective.
The Edje object should use the global perspective if it didn't have its
own perspective set.



SVN revision: 62146
2011-08-05 18:08:07 +00:00
Cedric BAIL 8b674974f6 edje: remove warning.
SVN revision: 60553
2011-06-21 14:31:37 +00:00
Carsten Haitzler d02f25e1ff whover did table and box support forgot:
1. table to have min.h/v ability like box
2. to ACTUALLY implement box h/v (and well of course implement
tableh/v too)

this basically fixes this working at all and completes the feature to
table too.



SVN revision: 59960
2011-06-04 15:58:02 +00:00
Carsten Haitzler 87ec659bc6 use the ecore pos map call for edje as opposed to do it yourself. this
also opens up new position mappings like factored accel/decel/sin,
divis, bounce and spring! :) documentation provided.



SVN revision: 59449
2011-05-16 13:16:34 +00:00
Carsten Haitzler 0b0d51c5cf add text effect shadow direction support.
SVN revision: 58548
2011-04-11 12:08:03 +00:00
Carsten Haitzler 51a9855952 valign applied to tetxblock parts. yay!
SVN revision: 58203
2011-03-30 11:43:22 +00:00
Cedric BAIL d0810de637 edje: add PROXY part.
example:

collections {
   group {
      name: "main";
      parts {
         part {
            name: "sub1";
            type: GROUP;
            source: "sub1";

            description {
               rel1.relative: 0.5 0.5;
               rel2.relative: 1.0 1.0;
            }
         }

         part {
            name: "pro2";
            type: PROXY;

            description {
               rel1.relative: 0.0 0.5;
               rel2.relative: 0.5 1.0;
               source: "sub1";
               color: 255 0 0 128;

               map {
                  on: 1;
                  smooth: 1;
                  rotation {
                     z: 30;
                  }
               }
            }
         }
      }
   }

   group {
      name: "sub1";
      parts {
         part {
            name: "rect";
            type: RECT;

            description {
               rel1.relative: 0.0 0.0;
               rel2.relative: 0.5 0.5;
               color: 255 0 0 255;

               map {
                  on: 1;
                  smooth: 1;
                  rotation {
                     z: -30;
                  }
               }
            }
         }

         part {
            name: "pro1";
            type: PROXY;

            description {
               rel1.relative: 0.5 0.0;
               rel2.relative: 1.0 0.7;
               color: 128 128 0 128;
               source: rect;
            }
         }
      }
   }
}




SVN revision: 57694
2011-03-11 17:46:29 +00:00
Tom Hacohen 5e33a75553 Edje: Added mirrored mode. Mirrored mode is used for UI-mirroring. It lets you mirror edje objects automatically (it also sends signals to the .edc code so you can do tweaks if you want), no need to create a special theme just for rtl layouts.
This is controlled by the two added API functions.
The changes in Elementary that utilize these functions will be committed soon.

SVN revision: 56635
2011-02-01 13:26:49 +00:00
Carsten Haitzler 998ffa4094 fix test min AND max bool flags to work right again. :)
SVN revision: 56280
2011-01-24 10:35:34 +00:00
Carsten Haitzler 567d9037fe type part gradient shouldnt cause an abort! just ignore it!
SVN revision: 56172
2011-01-16 04:11:47 +00:00
Carsten Haitzler b118d95efd use unused instead of dead code to silence warnings
SVN revision: 56167
2011-01-16 04:00:50 +00:00
Vincent Torri c69cd7ec27 use size_t when it does not hurt
SVN revision: 55548
2010-12-14 06:19:30 +00:00
Carsten Haitzler f1ec894769 fix inlined fonts again.
SVN revision: 53258
2010-10-11 07:24:46 +00:00
Gustavo Sverzut Barbieri 7ac13f931f better log.
* lower case domain names;

 * binaries use their own color (EDJE_CC_DEFAULT_LOG_COLOR)

 * log messages do not take multiple lines, it's annoying. The colors
   should call your attention already.

 * the ever annoying "did you forgot fixed: 1 1;" message that used to
   consume 3 lines is now bit more descriptive and uses a single line.



SVN revision: 53178
2010-10-08 00:24:22 +00:00
Leandro Pereira 9dc21add3a edje_cc: Don't dereference a NULL pointer on badly-formed .edj files.
(Should have been on r52931.)


SVN revision: 52932
2010-09-30 21:37:49 +00:00
Gustavo Sverzut Barbieri abc87fd449 Adding a transition layout animation for edje box.
Perform an animation when changing the layout from an edje box.

By: Otavio Pontes <otavio@profusion.mobi>

-------

Sample EDC:

{{{

collections {
   group {
      name: "main";
      min: 500 500;
      max: 500 500;
      parts {
         part {
            name: "bg";
            type: RECT;
            description {
               color: 255 255 255 255;
               rel1 { relative: 0.0 0.0; }
               rel2 { relative: 1.0 1.0; }
            }
         }
         part {
            name: "box1";
            type: BOX;
            description {
               state: "default" 0.0;
               box {
                  layout: vertical;
                  padding: 0 0;
               }
               rel1 {
                  relative: 0.0 0.0;
               }
               rel2 {
                  relative: 1.0 1.0;
               }
            }
            description {
               state: "default" 0.1;
               inherit: "default" 0.0;
               box {
                  padding: 10 10;
                  layout: horizontal;
               }
            }
            description {
               state: "default" 0.2;
               inherit: "default" 0.0;
               box {
                  layout: vertical;
               }
               rel1 {
                  relative: 0.0 0.0;
                  offset: 100 100;
               }
               rel2 {
                  relative: 1.0 1.0;
               }
            }
            box {
               items {
                  item {
                     name: "rect1";
                     type: GROUP;
                     source: "grp_rect1";
                     weight: 1.0 1.0;
                     align: -1 -1;
                  }
                  item {
                     name: "rect2";
                     type: GROUP;
                     source: "grp_rect2";
                     weight: 1.0 1.0;
                     align: -1 -1;
                  }
               }
            }
         }
      }
      programs {
         program {
            name: "change_layout";
            signal: "mouse,clicked,1";
            source: "box1";
            action: STATE_SET "default" 0.1;
            target: "box1";
            transition: LINEAR 5.0;
            after: "change_back";
         }
         program {
            name: "change_back";
            action: STATE_SET "default" 0.2;
            target: "box1";
            transition: LINEAR 5.0;
         }
     }
   }
   group {
      name: "grp_rect1";
      parts {
         part {
            name: "r1";
            type: RECT;
            description {
               state: "default" 0.0;
               color: 255 0 0 255;
               rel1 { relative: 0.0 0.0; }
               rel2 { relative: 1.0 1.0; }
            }
            description {
               state: "default" 0.1;
               inherit: "default" 0.0;
               color: 255 0 0 255;
            }
         }
      }
   }
   group {
      name: "grp_rect2";
      parts {
         part {
            name: "r2";
            type: RECT;
            description {
               state: "default" 0.0;
               color: 0 255 0 255;
               rel1 { relative: 0.0 0.0; }
               rel2 { relative: 1.0 1.0; }
            }
            description {
               state: "default" 0.1;
               color: 0 0 255 255;
            }
         }
      }
   }
}

}}}



SVN revision: 52871
2010-09-29 00:28:54 +00:00
Vincent Torri 1e1bb3b6a4 Put everything in edje_private. It should fix a compilation
bug on Windows

SVN revision: 52736
2010-09-25 17:10:33 +00:00
Carsten Haitzler 82470f073e correctness!
SVN revision: 52618
2010-09-23 02:52:19 +00:00
Carsten Haitzler af2651748c int -> enum.
SVN revision: 52589
2010-09-22 13:27:09 +00:00
Cedric BAIL 8102552b7a * edje: cleanup aspect code and reduce memory presure.
SVN revision: 52304
2010-09-15 14:15:23 +00:00
Cedric BAIL 10356b8e50 * edje: turn it on again and go fix your theme :-)
SVN revision: 52303
2010-09-15 14:09:58 +00:00
Carsten Haitzler c1c7e901f5 CEEEEEEEEEDRICCCCCCCCCCCCCCCC!
borked e conf panel. unbork. disable aspect.



SVN revision: 52273
2010-09-14 22:32:34 +00:00
Cedric BAIL 2e87895f67 * edje: remove use of flags as it was always set to FLAG_XY
in _edje_part_recalc_single.


SVN revision: 52245
2010-09-14 15:53:47 +00:00
Cedric BAIL d1203fc0ca * edje: fix edje use of aspect when constrained by min or max.
NOTE: If you have swallow or parts that where constrained by min and
	max, and you used aspect on them, expect change on your layout.


SVN revision: 52244
2010-09-14 15:36:16 +00:00
Lucas De Marchi 3bec660090 Fix common misspellings
Following misspellings were fixed:

ammount->amount
arbitary->arbitrary
begining->beginning
carefull->careful
choosen->chosen
commited->committed
endig->ending
existance->existence
existant->existent
isnt->isn't
occured->occurred
postion->position
rougly->roughly
runing->running
shouldnt->shouldn't
soem->some
succesfully->successfully
succesful->successful
sucessful->successful
tranformed->transformed
usefull->useful
wehn->when
wich->which



SVN revision: 51988
2010-09-08 11:50:05 +00:00
Cedric BAIL e687c13d1c * edje: fix interpolation of text color during animation.
SVN revision: 51782
2010-08-31 13:30:11 +00:00
Lucas De Marchi 5a8a8c9014 Convert (hopefully) all comparisons to NULL
Apply badzero.cocci, badnull.coci and badnull2.cocci

This should convert all cases where there's a comparison to NULL to simpler
forms. This patch applies the following transformations:

code before patch               ||code after patch
===============================================================

return a == NULL;                 return !a;

return a != NULL;                 return !!a;

func(a == NULL);                  func(!a);

func(a != NULL);                  func(!!a);

b = a == NULL;                    b = !a;

b = a != NULL;                    b = !!a;

b = a == NULL ? c : d;            b = !a ? c : d;

b = a != NULL ? c : d;            b = a ? c : d;


other cases:

a == NULL                         !a
a != NULL                         a




SVN revision: 51487
2010-08-21 13:52:25 +00:00
Christopher Michael e8de81de74 Fix 'may be used uninitialized' warnings.
SVN revision: 51292
2010-08-18 16:51:10 +00:00
Cedric BAIL 2623367732 * edje: fix some memleak issue.
SVN revision: 51033
2010-08-12 12:58:54 +00:00
Iván Briano b8b8381576 No need for path in font_directory, and use the right key to store/find them
SVN revision: 50999
2010-08-11 14:24:03 +00:00
Cedric BAIL 9ecc1354c6 * edje: new file format.
WARNING ! WARNING ! WARNING ! WARNING !
	Old file format is not readable by edje directly. If you have old edje
	file that you want to convert, use edje_convert. Their is no way back.

	Recompile your file as soon as possible. Please report any issue you
	spot as this is a huge and needed change.



SVN revision: 50936
2010-08-09 17:34:03 +00:00
Lucas De Marchi 0a4617ae38 FORMATTING
* Remove vim modelines:
 find . -name '*.[chx]' -exec sed -i '/\/\*$/ {N;N;/ \* vim:ts/d}' \{\} \;
 find . -name '*.[chx]' -exec sed -i '/\/[\*\/] *vim:/d' \{\} \;

* Remove leading blank lines:
 find . -name '*.[cxh]' -exec sed -i '/./,$!d'

If you use vim, use this in your .vimrc:
set ts=8 sw=3 sts=8 expandtab cino=>5n-3f0^-2{2(0W1st0



SVN revision: 50816
2010-08-04 16:57:32 +00:00
Cedric BAIL 74f7480e41 * edje: fix some issue during destruction of edje_part_description,
and move tweens to an array.


SVN revision: 50765
2010-08-03 12:58:31 +00:00
Cedric BAIL e773bc9246 * edje: change memory layout that will become the new file format.
NOTE: I tried this change with all the apps and theme I had, but maybe
	i missed some bug. Please report any strange behaviour.


SVN revision: 50641
2010-07-29 12:02:36 +00:00
Cedric BAIL 793c66b5dc * edje: last move of properties in the right structure.
SVN revision: 50284
2010-07-16 16:00:26 +00:00
Cedric BAIL 04ffefa9e5 * edje: move image specific properties to their own structure.
SVN revision: 50282
2010-07-16 14:13:38 +00:00
Cedric BAIL 30d35eb1ba * edje: start to split structure content.
SVN revision: 50279
2010-07-16 11:37:58 +00:00
Cedric BAIL b49c2411bd * edje: when gradient meet dodo. Yes, they are gone !
SVN revision: 50223
2010-07-13 15:47:19 +00:00
Cedric BAIL 4e30cb2411 * edje: move structure from Eina_List to array now that Eet support
them.


SVN revision: 49936
2010-06-29 13:48:03 +00:00
Cedric BAIL e17a4089df * edje: This is the first commit of a rewrite of edje file
internal representation.

	The objectiv is to simplify code, consume less CPU and memory
	without loosing feature. Please report any breakage when you
	see them. It will take a few weeks before we change the file
	layout, during that time the load time may increase.


SVN revision: 49922
2010-06-28 13:56:30 +00:00
Cedric BAIL 83e505b5c6 * edje: Add image set support.
Ease support of Freedesktop multiple size image.

	Sample:
	-------

	images {
		..
	       	set {
			name: "image_name_used";
  			image {
				image: "500x500.png" LOSSY 90;
     				size: 201 201 500 500;
  			}
  			image {
				image: "200x200.png" COMP;
     				size: 51 51 200 200;
  			}
  			image {
				image: "50x50.png" COMP;
     				size: 11 11 50 50;
  			}
  			image {
				image: "10x10.png" COMP;
     				size: 0 0 10 10;
  			}
		}
		..
	}



SVN revision: 49369
2010-06-01 13:31:07 +00:00
Carsten Haitzler 9f030460b3 use part geom for map - better for text.. oh yeah.
SVN revision: 48498
2010-05-01 12:40:27 +00:00
Tiago Rezende Campos Falcao ad8314a7ce Removing ugly whitespaces
SVN revision: 48145
2010-04-19 20:37:40 +00:00
Tiago Rezende Campos Falcao a3333361f5 Dont need recalc params in external description in part_recalc.
Others types, like TEXT/TEXTBLOCK/SWALLOW/GROUP (others?), are similar to Externals. And may can recalc some properties only in description_apply, not on every call to part_recalc.

Some generic boolean properties, like "visible", can be moved to description_appy too.

SVN revision: 48144
2010-04-19 20:37:35 +00:00