diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/edje/src/lib/edje_private.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libraries/edje/src/lib/edje_private.h b/libraries/edje/src/lib/edje_private.h index cbb3e03..8bf18eb 100644 --- a/libraries/edje/src/lib/edje_private.h +++ b/libraries/edje/src/lib/edje_private.h | |||
@@ -192,7 +192,8 @@ typedef enum | |||
192 | EDJE_ASPECT_PREFER_NONE, | 192 | EDJE_ASPECT_PREFER_NONE, |
193 | EDJE_ASPECT_PREFER_VERTICAL, | 193 | EDJE_ASPECT_PREFER_VERTICAL, |
194 | EDJE_ASPECT_PREFER_HORIZONTAL, | 194 | EDJE_ASPECT_PREFER_HORIZONTAL, |
195 | EDJE_ASPECT_PREFER_BOTH | 195 | EDJE_ASPECT_PREFER_BOTH, |
196 | EDJE_ASPECT_PREFER_SOURCE | ||
196 | } Edje_Internal_Aspect; | 197 | } Edje_Internal_Aspect; |
197 | 198 | ||
198 | struct _Edje_Perspective | 199 | struct _Edje_Perspective |
@@ -232,7 +233,7 @@ struct _Edje_Color | |||
232 | struct _Edje_Aspect_Prefer | 233 | struct _Edje_Aspect_Prefer |
233 | { | 234 | { |
234 | FLOAT_T min, max; | 235 | FLOAT_T min, max; |
235 | Edje_Internal_Aspect prefer; | 236 | char prefer; |
236 | }; | 237 | }; |
237 | 238 | ||
238 | struct _Edje_Aspect | 239 | struct _Edje_Aspect |
@@ -834,6 +835,11 @@ struct _Edje_Part_Description_Common | |||
834 | unsigned char w, h; /* width or height is fixed in side (cannot expand with Edje object size) */ | 835 | unsigned char w, h; /* width or height is fixed in side (cannot expand with Edje object size) */ |
835 | } fixed; | 836 | } fixed; |
836 | 837 | ||
838 | struct { // only during recalc | ||
839 | unsigned char have; | ||
840 | FLOAT_T w, h; | ||
841 | } minmul; | ||
842 | |||
837 | Edje_Size min, max; | 843 | Edje_Size min, max; |
838 | Edje_Position step; /* size stepping by n pixels, 0 = none */ | 844 | Edje_Position step; /* size stepping by n pixels, 0 = none */ |
839 | Edje_Aspect_Prefer aspect; | 845 | Edje_Aspect_Prefer aspect; |
@@ -1138,6 +1144,7 @@ struct _Edje | |||
1138 | unsigned int all_part_change : 1; | 1144 | unsigned int all_part_change : 1; |
1139 | #endif | 1145 | #endif |
1140 | unsigned int have_mapped_part : 1; | 1146 | unsigned int have_mapped_part : 1; |
1147 | unsigned int recalc_call : 1; | ||
1141 | }; | 1148 | }; |
1142 | 1149 | ||
1143 | struct _Edje_Calc_Params | 1150 | struct _Edje_Calc_Params |
@@ -1915,7 +1922,7 @@ void _edje_entry_cursor_line_end(Edje_Real_Part *rp, Edje_Cursor cur); | |||
1915 | Eina_Bool _edje_entry_cursor_coord_set(Edje_Real_Part *rp, Edje_Cursor cur, int x, int y); | 1922 | Eina_Bool _edje_entry_cursor_coord_set(Edje_Real_Part *rp, Edje_Cursor cur, int x, int y); |
1916 | Eina_Bool _edje_entry_cursor_is_format_get(Edje_Real_Part *rp, Edje_Cursor cur); | 1923 | Eina_Bool _edje_entry_cursor_is_format_get(Edje_Real_Part *rp, Edje_Cursor cur); |
1917 | Eina_Bool _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Cursor cur); | 1924 | Eina_Bool _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Cursor cur); |
1918 | const char *_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur); | 1925 | char *_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur); |
1919 | void _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos); | 1926 | void _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos); |
1920 | int _edje_entry_cursor_pos_get(Edje_Real_Part *rp, Edje_Cursor cur); | 1927 | int _edje_entry_cursor_pos_get(Edje_Real_Part *rp, Edje_Cursor cur); |
1921 | void _edje_entry_input_panel_layout_set(Edje_Real_Part *rp, Edje_Input_Panel_Layout layout); | 1928 | void _edje_entry_input_panel_layout_set(Edje_Real_Part *rp, Edje_Input_Panel_Layout layout); |