hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=5fd165eaf43321aa021e8c1bd4249309654de663
commit 5fd165eaf43321aa021e8c1bd4249309654de663 Author: ChunEon Park <[email protected]> Date: Tue Dec 16 10:10:52 2014 +0900 theme: improve candidate popup gui. --- data/themes/default/images.edc | 8 +-- data/themes/default/images/Makefile.am | 4 +- data/themes/default/images/slider_down.png | Bin 0 -> 272 bytes data/themes/default/images/slider_up.png | Bin 0 -> 309 bytes data/themes/default/layout_common.edc | 76 +++++++++++++---------------- 5 files changed, 40 insertions(+), 48 deletions(-) diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc index e152e28..1a1c4f1 100644 --- a/data/themes/default/images.edc +++ b/data/themes/default/images.edc @@ -1,6 +1,6 @@ images { - image: "sym_up_light_normal.png" COMP; - image: "sym_down_light_normal.png" COMP; + image: "slider_up.png" COMP; + image: "slider_down.png" COMP; image: "menu.png" COMP; image: "find.png" COMP; image: "highlight.png" COMP; @@ -111,7 +111,7 @@ group { name: "up"; part { name: "img"; type: IMAGE; description { state: "default" 0.0; - image.normal: "sym_up_light_normal.png"; + image.normal: "slider_up.png"; } } } @@ -122,7 +122,7 @@ group { name: "down"; part { name: "img"; type: IMAGE; description { state: "default" 0.0; - image.normal: "sym_down_light_normal.png"; + image.normal: "slider_down.png"; } } } diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 87af98c..ac204cf 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -65,4 +65,6 @@ EXTRA_DIST = \ live_text.png \ live_textblock.png \ live_edit.png \ - new.png + new.png \ + slider_up.png \ + slider_down.png diff --git a/data/themes/default/images/slider_down.png b/data/themes/default/images/slider_down.png new file mode 100644 index 0000000..30f398a Binary files /dev/null and b/data/themes/default/images/slider_down.png differ diff --git a/data/themes/default/images/slider_up.png b/data/themes/default/images/slider_up.png new file mode 100644 index 0000000..3eac5de Binary files /dev/null and b/data/themes/default/images/slider_up.png differ diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index 4399ea1..6cfeeb1 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -1565,7 +1565,7 @@ group { name: "slider_layout"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 278 52; + min: 240 1; color: 56 56 56 255; } description { state: "odd" 0.0; @@ -1581,7 +1581,7 @@ group { name: "slider_layout"; rel2.to: "base"; rel2.relative: 0.0 1.0; align: 0.0 0.5; - min: 50 0; + min: 35 0; fixed: 1 0; } } @@ -1590,12 +1590,13 @@ group { name: "slider_layout"; scale: 1; description { state: "default" 0.0; rel1.to: "text_base"; + rel1.offset: 5 0; rel2.to: "text_base"; align: 0.0 0.5; fixed: 1 0; text { font: FN; - size: 12; + size: 10; align: 0.0 0.5; min: 1 0; ellipsis: -1; @@ -1611,7 +1612,7 @@ group { name: "slider_layout"; rel1.relative: 1.0 0.0; rel2.to: "text_base"; align: 0.0 0.5; - min: 10 0; + min: 5 0; fixed: 1 0; } } @@ -1627,7 +1628,7 @@ group { name: "slider_layout"; fixed: 1 1; text { font: FN; - size: 10; + size: 8; align: 0.0 0.0; min: 1 1; ellipsis: -1; @@ -1647,7 +1648,7 @@ group { name: "slider_layout"; fixed: 1 1; text { font: FN; - size: 10; + size: 8; align: 0.0 0.5; min: 1 1; ellipsis: -1; @@ -1662,69 +1663,58 @@ group { name: "slider_layout"; rel1.to_x: "padding1"; rel1.to_y: "elm.text.slider_min"; rel1.relative: 1.0 1.0; - rel2.to: "padding2"; - rel2.relative: 0.0 1.0; - } - } - part { name: "padding2"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - rel1.to_x: "entry_base"; - rel1.to_y: "base"; - rel2.to_x: "entry_base"; - rel2.to_y: "base"; - rel2.relative: 0.0 1.0; - align: 1.0 0.5; - min: 10 0; + rel2.to: "padding1"; + rel2.relative: 1.0 1.0; + align: 0 0; + min: 125 0; fixed: 1 0; } } - part { name: "entry_base"; + part { name: "padding2"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 40 0; + rel1.to_x: "elm.swallow.slider"; + rel2.to_x: "elm.swallow.slider"; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.0 0.5; + min: 5 0; fixed: 1 0; - align: 1.0 0.5; - rel1.to_x: "elm.swallow.up"; - rel1.to_y: "base"; - rel2.to_x: "elm.swallow.down"; - rel2.to_y: "base"; - rel2.relative: 0.0 1.0; } } part { name: "elm.swallow.entry"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - rel1.to: "entry_base"; - rel2.to: "entry_base"; + rel1.to_x: "padding2"; + rel2.to_x: "elm.swallow.down"; + rel2.relative: 0 1; + align: 1 0.5; + max: 30 999999; } } - part { name: "elm.swallow.up"; + part { name: "elm.swallow.down"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 24 24; + min: 10 20; fixed: 1 1; - align: 1.0 1.0; - rel1.to: "base"; - rel1.relative: 1.0 0.5; - rel2.to: "base"; - rel2.relative: 1.0 0.5; + align: 1.0 0.5; + rel1.to: "elm.swallow.up"; + rel1.relative: 0.0 0.5; + rel2.to: "elm.swallow.up"; + rel2.relative: 0.0 0.5; } } - part { name: "elm.swallow.down"; + part { name: "elm.swallow.up"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 24 24; + min: 10 20; fixed: 1 1; - align: 1.0 0.0; - rel1.to: "base"; + align: 1.0 0.5; rel1.relative: 1.0 0.5; - rel2.to: "base"; rel2.relative: 1.0 0.5; } } --
