rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=7267b41504bbb58ea6b474c9d847bba534d921ee
commit 7267b41504bbb58ea6b474c9d847bba534d921ee Author: Andrii Kroitor <[email protected]> Date: Mon Mar 21 07:52:32 2016 +0200 theme: fix 'fixed' errors --- data/themes/default/widgets/button.edc | 2 ++ data/themes/default/widgets/check.edc | 5 +++++ data/themes/default/widgets/cursor.edc | 25 ++++++++++++------------ data/themes/default/widgets/entry.edc | 1 + data/themes/default/widgets/genlist.edc | 16 +++++++++++++++ data/themes/default/widgets/layout.edc | 1 + data/themes/default/widgets/layouts/property.edc | 8 ++++++++ data/themes/default/widgets/menu.edc | 6 +++++- data/themes/default/widgets/popup.edc | 6 ++++++ data/themes/default/widgets/radio.edc | 1 + data/themes/default/widgets/segment_control.edc | 1 + 11 files changed, 59 insertions(+), 13 deletions(-) diff --git a/data/themes/default/widgets/button.edc b/data/themes/default/widgets/button.edc index 2ec7577..9a83ed8 100644 --- a/data/themes/default/widgets/button.edc +++ b/data/themes/default/widgets/button.edc @@ -39,6 +39,7 @@ group { name: "elm/button/base/default"; description { state: "default" 0.0; visible: 0; align: 0.0 0.5; + fixed: 1 0; rel2 { relative: 0.0 1.0; } @@ -298,6 +299,7 @@ group { name: "elm/button/base/anchor"; description { state: "default" 0.0; visible: 0; align: 0.0 0.5; + fixed: 1 0; rel1 { offset: 2 2; } diff --git a/data/themes/default/widgets/check.edc b/data/themes/default/widgets/check.edc index c15792f..6dde5f7 100644 --- a/data/themes/default/widgets/check.edc +++ b/data/themes/default/widgets/check.edc @@ -68,6 +68,7 @@ group { name: "elm/check/base/toggle"; description { state: "default" 0.0; visible: 0; align: 0.0 0.5; + fixed: 1 0; rel2 { relative: 0.0 1.0; } @@ -76,6 +77,7 @@ group { name: "elm/check/base/toggle"; align: 0.0 0.5; min: 19 19; max: 0 0; + fixed: 1 0; rel2 { relative: 0.0 1.0; } @@ -498,6 +500,7 @@ group { name: "elm/check/base/default"; visible: 0; align: 0.0 0.5; max: 0 -1; + fixed: 1 0; rel1 { relative: 1.0 0.0; to_x: "bg"; @@ -787,6 +790,7 @@ group { name: "elm/check/base/eye"; visible: 0; align: 0.0 0.5; max: 0 -1; + fixed: 1 0; rel1 { relative: 1.0 0.0; to_x: "bg"; @@ -799,6 +803,7 @@ group { name: "elm/check/base/eye"; description { state: "visible" 0.0; align: 0.0 0.5; max: 0 -1; + fixed: 1 0; rel1 { relative: 1.0 0.0; offset: 6 0; diff --git a/data/themes/default/widgets/cursor.edc b/data/themes/default/widgets/cursor.edc index e7053a1..8a1ffa1 100644 --- a/data/themes/default/widgets/cursor.edc +++ b/data/themes/default/widgets/cursor.edc @@ -8,7 +8,7 @@ #define SIZING "cursor-sizing.png" #define HAND1 "cursor-hand1.png" -#define CURSOR(NAME, IMG, IMG_W, IMG_H, REL1, REL2) \ +#define CURSOR(NAME, IMG, IMG_W, IMG_H, REL) \ group { name: "elm/cursor/"##NAME##"/default"; \ images.image: IMG COMP; \ parts { \ @@ -23,23 +23,24 @@ group { name: "elm/cursor/"##NAME##"/default"; \ part { name: "hotspot"; \ type: SPACER; \ description { state: "default" 0.0; \ - rel1.relative: REL1; \ - rel2.relative: REL2; \ + fixed: 1 1; \ + rel1.relative: REL; \ + rel2.relative: REL; \ } \ } \ } \ } -CURSOR(arrow, ARROW, 18, 15, 0.0 0.0, 0.0 0.0) -CURSOR(bottom_left_corner, BOTTOM_LEFT_CORNER, 12, 12, 0.0 1.0, 0.0 1.0) -CURSOR(bottom_right_corner, BOTTOM_RIGHT_CORNER, 12, 12, 1.0 1.0, 1.0 1.0) -CURSOR(top_left_corner, TOP_LEFT_CORNER, 12, 12, 0.0 0.0, 0.0 0.0) -CURSOR(top_right_corner, TOP_RIGHT_CORNER, 12, 12, 1.0 0.0, 1.0 0.0) -CURSOR(crosshair, CROSSHAIR, 21, 21, 0.5 0.5, 0.5 0.5) -CURSOR(fleur, FLEUR, 25, 25, 0.5 0.5, 0.5 0.5) -CURSOR(sizing, SIZING, 19, 19, 0.5 0.5, 0.5 0.5) +CURSOR(arrow, ARROW, 18, 15, 0.0 0.0) +CURSOR(bottom_left_corner, BOTTOM_LEFT_CORNER, 12, 12, 0.0 1.0) +CURSOR(bottom_right_corner, BOTTOM_RIGHT_CORNER, 12, 12, 1.0 1.0) +CURSOR(top_left_corner, TOP_LEFT_CORNER, 12, 12, 0.0 0.0) +CURSOR(top_right_corner, TOP_RIGHT_CORNER, 12, 12, 1.0 0.0) +CURSOR(crosshair, CROSSHAIR, 21, 21, 0.5 0.5) +CURSOR(fleur, FLEUR, 25, 25, 0.5 0.5) +CURSOR(sizing, SIZING, 19, 19, 0.5 0.5) /* 7 and 1 it offset in image to plese where see the 'hand finger'*/ -CURSOR(hand1, HAND1, 19, 24, (7/19) (1/24), (7/19) (1/24)) +CURSOR(hand1, HAND1, 19, 24, (7/19) (1/24)) #undef ARROW #undef BOTTOM_LEFT_CORNER diff --git a/data/themes/default/widgets/entry.edc b/data/themes/default/widgets/entry.edc index 22addaa..e105ab8 100644 --- a/data/themes/default/widgets/entry.edc +++ b/data/themes/default/widgets/entry.edc @@ -1028,6 +1028,7 @@ group { name: "elm/scroller/entry_single/default"; description { state: "default" 0.0; align: 1.0 0.5; max: 19 -1; + fixed: 1 0; rel1 { relative: 1.0 0.0; offset: 0 1; diff --git a/data/themes/default/widgets/genlist.edc b/data/themes/default/widgets/genlist.edc index ec4c4e7..622a2d2 100644 --- a/data/themes/default/widgets/genlist.edc +++ b/data/themes/default/widgets/genlist.edc @@ -52,6 +52,7 @@ group { name: "elm/genlist/item/default/default"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.5; + fixed: 1 0; rel2 { relative: 0.0 1.0; } @@ -119,6 +120,7 @@ group { name: "elm/genlist/item/default/default"; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; + fixed: 1 0; rel1 { relative: 1.0 0.0; offset: 0 3; @@ -421,6 +423,7 @@ group { name: "elm/genlist/tree/default/default"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.5; + fixed: 1 0; rel2 { relative: 0.0 1.0; } @@ -481,6 +484,7 @@ group { name: "elm/genlist/tree/default/default"; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; + fixed: 1 0; rel1 { relative: 1.0 0.0; offset: 0 3; @@ -494,6 +498,7 @@ group { name: "elm/genlist/tree/default/default"; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; + fixed: 1 0; rel1 { relative: 1.0 0.0; offset: 0 3; @@ -688,6 +693,7 @@ group { name: "elm/genlist/tree/part/default"; min: 14 14; aspect: 1.0 1.0; aspect_preference: VERTICAL; + fixed: 1 0; rel1 { offset: 6 3; } @@ -726,6 +732,7 @@ group { name: "elm/genlist/tree/part/default"; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; + fixed: 1 0; rel1 { relative: 1.0 0.0; offset: 0 3; @@ -854,6 +861,7 @@ group { name: "elm/genlist/item/state/default"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.5; + fixed: 1 0; rel1 { offset: -8 0; } @@ -960,6 +968,7 @@ group { name: "elm/genlist/item/item/default"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.5; + fixed: 1 0; rel1 { offset: 0 0; } @@ -1087,6 +1096,7 @@ group { name: "elm/genlist/item/program/default"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.5; + fixed: 1 0; rel1 { offset: 26 0; } @@ -1124,6 +1134,7 @@ group { name: "elm/genlist/item/program/default"; description { state: "default" 0.0; align: 1.0 0.5; aspect: 1.0 1.0; + fixed: 1 0; aspect_preference: VERTICAL; rel1 { relative: 1.0 0.0; @@ -1192,6 +1203,7 @@ group { name: "elm/genlist/tree/items_caption/default"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.5; + fixed: 1 0; rel2 { relative: 0.0 1.0; } @@ -1381,6 +1393,7 @@ group { name: "elm/genlist/tree/caption/default"; min: 14 14; aspect: 1.0 1.0; aspect_preference: VERTICAL; + fixed: 1 0; rel1 { offset: 6 3; } @@ -1597,6 +1610,7 @@ group { name: "elm/genlist/item/navigator/default"; parts { part { name: "elm.swallow.icon"; description { state: "default" 0.0; + fixed: 1 0; rel1 { relative: 1.0 0.0; offset: 26 3; @@ -1609,6 +1623,7 @@ group { name: "elm/genlist/item/navigator/default"; } part { name: "elm.swallow.pad"; description { state: "default" 0.0; + fixed: 1 0; rel1 { to: ""; relative: 0.0 0.0; @@ -1674,6 +1689,7 @@ group { name: "elm/genlist/item/message/default"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.5; + fixed: 1 0; rel1 { offset: 6 0; } diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index 474a0ef..4165fb5 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -1846,6 +1846,7 @@ group { name: "elm/layout/entry/overlay"; type: SWALLOW; description { state: "default" 0.0; align: 0.5 0.0; + fixed: 1 1; rel1 { relative: 0.5 1.0; offset: 0 6; diff --git a/data/themes/default/widgets/layouts/property.edc b/data/themes/default/widgets/layouts/property.edc index 5598dde..70f1c89 100644 --- a/data/themes/default/widgets/layouts/property.edc +++ b/data/themes/default/widgets/layouts/property.edc @@ -276,6 +276,7 @@ group { name: "elm/layout/property/2swallow"; min: 52 0; max: 52 -1; color_class: "main"; + fixed: 1 0; rel1 { to: "area.swallow1"; } @@ -335,6 +336,7 @@ group { name: "elm/layout/property/2swallow"; min: 52 0; max: 52 -1; color_class: "main"; + fixed: 1 0; rel1 { to: "area.swallow2"; } @@ -486,6 +488,7 @@ group { name: "elm/layout/property/2swallow_pad"; min: 52 0; max: 52 -1; color_class: "main"; + fixed: 1 0; rel1 { to: "area.swallow1"; } @@ -545,6 +548,7 @@ group { name: "elm/layout/property/2swallow_pad"; min: 52 0; max: 52 -1; color_class: "main"; + fixed: 1 0; rel1 { to: "area.swallow2"; } @@ -712,6 +716,7 @@ group { name: "elm/layout/property/2swallow_vertical"; min: 52 0; max: 52 -1; color_class: "main"; + fixed: 1 0; rel1 { to: "area.swallow1"; } @@ -770,6 +775,7 @@ group { name: "elm/layout/property/2swallow_vertical"; min: 52 0; max: 52 -1; color_class: "main"; + fixed: 1 0; rel1 { to: "area.swallow2"; } @@ -934,6 +940,7 @@ group { name: "elm/layout/property/2swallow_vertical_pad"; min: 52 0; max: 52 -1; color_class: "main"; + fixed: 1 0; rel1 { to: "area.swallow1"; } @@ -992,6 +999,7 @@ group { name: "elm/layout/property/2swallow_vertical_pad"; min: 52 0; max: 52 -1; color_class: "main"; + fixed: 1 0; rel1 { to: "area.swallow2"; } diff --git a/data/themes/default/widgets/menu.edc b/data/themes/default/widgets/menu.edc index f953af8..d241873 100644 --- a/data/themes/default/widgets/menu.edc +++ b/data/themes/default/widgets/menu.edc @@ -839,7 +839,7 @@ group { name: "elm/hover/base/main_menu/default"; clip_to: "bottomclip"; description { state: "default" 0.0; align: 0.5 0.0; - fixed: 1 0; + fixed: 0 1; rel1 { to: "elm.swallow.size"; relative: 0.0 1.0; @@ -880,6 +880,7 @@ group { name: "elm/hover/base/main_menu_submenu/default"; repeat_events: 1; description { state: "default" 0.0; align: 0.0 0.0; + fixed: 1 1; rel2.relative: 0.0 0.0; } } @@ -887,6 +888,7 @@ group { name: "elm/hover/base/main_menu_submenu/default"; type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.0; + fixed: 1 1; rel1 { to: "elm.swallow.offset"; relative: 1.0 1.0; @@ -926,6 +928,7 @@ group { name: "elm/hover/base/main_menu_submenu/default"; clip_to: "bottomclip"; description { state: "default" 0.0; align: 0.5 1.0; + fixed: 0 1; rel1 { to: "elm.swallow.slot.middle"; relative: 0.0 1.0; @@ -948,6 +951,7 @@ group { name: "elm/hover/base/main_menu_submenu/default"; repeat_events:1; description { state: "default" 0.0; visible: 0; + fixed: 0 1; rel1 { to: "elm.swallow.slot.middle"; relative: 0.0 1.0; diff --git a/data/themes/default/widgets/popup.edc b/data/themes/default/widgets/popup.edc index 42b7634..1191b12 100644 --- a/data/themes/default/widgets/popup.edc +++ b/data/themes/default/widgets/popup.edc @@ -604,6 +604,7 @@ group { name: "elm/popup/buttons1/popup/default"; scale: 1; description { state: "default" 0.0; align: 1.0 0.5; + fixed: 1 1; rel1 { relative: 1.0 0.5; offset: -12 0; @@ -624,6 +625,7 @@ group { name: "elm/popup/buttons2/popup/default"; scale: 1; description { state: "default" 0.0; align: 1.0 0.5; + fixed: 1 1; rel1 { relative: 0.0 0.5; offset: -12 0; @@ -641,6 +643,7 @@ group { name: "elm/popup/buttons2/popup/default"; scale: 1; description { state: "default" 0.0; align: 1.0 0.5; + fixed: 1 1; rel1 { relative: 1.0 0.5; offset: -12 0; @@ -661,6 +664,7 @@ group { name: "elm/popup/buttons3/popup/default"; scale: 1; description { state: "default" 0.0; align: 1.0 0.5; + fixed: 1 1; rel1 { relative: 0.0 0.5; offset: -12 0; @@ -678,6 +682,7 @@ group { name: "elm/popup/buttons3/popup/default"; scale: 1; description { state: "default" 0.0; align: 1.0 0.5; + fixed: 1 1; rel1 { relative: 0.0 0.5; offset: -12 0; @@ -695,6 +700,7 @@ group { name: "elm/popup/buttons3/popup/default"; scale: 1; description { state: "default" 0.0; align: 1.0 0.5; + fixed: 1 1; rel1 { relative: 1.0 0.5; offset: -12 0; diff --git a/data/themes/default/widgets/radio.edc b/data/themes/default/widgets/radio.edc index 2b09150..e97cc37 100644 --- a/data/themes/default/widgets/radio.edc +++ b/data/themes/default/widgets/radio.edc @@ -13,6 +13,7 @@ group { name: "elm/radio/base/style_editor"; max: 24 19; aspect: 1.0 1.0; aspect_preference: VERTICAL; + fixed: 1 0; rel1 { offset: 1 1; } diff --git a/data/themes/default/widgets/segment_control.edc b/data/themes/default/widgets/segment_control.edc index 53a79b4..5121f83 100644 --- a/data/themes/default/widgets/segment_control.edc +++ b/data/themes/default/widgets/segment_control.edc @@ -137,6 +137,7 @@ group { name: "elm/segment_control/item/default"; clip_to: "disabler"; description { state: "default" 0.0; align: 0.5 0.5; + fixed: 1 0; rel1.offset: 10 3; rel2.relative: 0.0 1.0; aspect: 1.0 1.0; --
