From a3c442bb52475e81e9ac6679c50f071eca84c83c Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 9 Feb 2012 11:18:03 +0000 Subject: [PATCH] elementary: fix elm_panel edc by Patrick Chevalier SVN revision: 67787 --- data/themes/widgets/panel.edc | 270 +++++++++++++++++++++--------------------- 1 file changed, 133 insertions(+), 137 deletions(-) diff --git a/data/themes/widgets/panel.edc b/data/themes/widgets/panel.edc index 006ca6f..8d57f70 100644 --- a/data/themes/widgets/panel.edc +++ b/data/themes/widgets/panel.edc @@ -48,9 +48,6 @@ group { { state: "default" 0.0; color: 255 255 255 0; - rel1.relative: 0.0 0.0; - rel1.offset: 0 0; - rel2.relative: 1.0 1.0; rel2.offset: -1 -1; } description @@ -65,24 +62,6 @@ group { } part { - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - rel2.offset: -20 -1; - image - { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } - } - } - part - { name: "clipper"; type: RECT; mouse_events: 0; @@ -103,18 +82,6 @@ group { } part { - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clipper"; - description - { - state: "default" 0.0; - rel1.to: "clipper"; - rel2.to: "clipper"; - } - } - part - { name: "btn"; type: IMAGE; mouse_events: 1; @@ -233,6 +200,36 @@ group { image.normal: "icon_arrow_right.png"; } } + part + { + name: "base"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + rel2.offset: -20 -1; + image + { + normal: "bt_dis_base.png"; + border: 4 4 4 4; + } + } + } + part + { + name: "elm.swallow.content"; + type: SWALLOW; + clip_to: "clipper"; + description + { + state: "default" 0.0; + rel1.to: "clipper"; + rel2.to: "clipper"; + } + } } programs { @@ -370,31 +367,13 @@ group { state: "hidden" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 -1.0; - rel1.offset: 0 21; + rel1.offset: 0 -21; rel2.relative: 1.0 0.0; rel2.offset: -1 20; } } part { - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - rel2.offset: -1 -20; - image - { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } - } - } - part - { name: "clipper"; type: RECT; mouse_events: 0; @@ -415,38 +394,26 @@ group { } part { - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clipper"; - description - { - state: "default" 0.0; - rel1.to: "clipper"; - rel2.to: "clipper"; - } - } - part - { name: "btn"; type: IMAGE; mouse_events: 1; description { state: "default" 0.0; - max: 32 48; + max: 48 32; fixed: 1 1; - align: 0.5 1.0; + align: 0.5 0.0; rel1 { relative: 0.0 1.0; - offset: -2 2; + offset: 0 -6; to_y: "base"; } rel2.to_y: "bg"; image { normal: "bt_base1.png"; - border: 12 4 5 0; + border: 12 4 0 5; } fill.smooth: 0; } @@ -545,6 +512,36 @@ group { image.normal: "icon_arrow_down.png"; } } + part + { + name: "base"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + rel2.offset: -1 -20; + image + { + normal: "bt_dis_base.png"; + border: 4 4 4 4; + } + } + } + part + { + name: "elm.swallow.content"; + type: SWALLOW; + clip_to: "clipper"; + description + { + state: "default" 0.0; + rel1.to: "clipper"; + rel2.to: "clipper"; + } + } } programs { @@ -682,27 +679,9 @@ group { state: "hidden" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 1.0; - rel1.offset: 0 20; + rel1.offset: -1 -24; rel2.relative: 1.0 2.0; - rel2.offset: -1 21; - } - } - part - { - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - rel1.to: "bg"; - rel1.offset: -1 -20; - rel2.to: "bg"; - image - { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } + rel2.offset: 0 -21; } } part @@ -727,38 +706,25 @@ group { } part { - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clipper"; - description - { - state: "default" 0.0; - rel1.to: "clipper"; - rel2.to: "clipper"; - } - } - part - { name: "btn"; type: IMAGE; mouse_events: 1; description { state: "default" 0.0; - max: 32 48; + max: 48 32; fixed: 1 1; align: 0.5 0.0; - rel1 - { - relative: 0.0 -1.0; - offset: -2 0; + rel1.to_y: "bg"; + rel2{ + relative: 1.0 0.0; + offset: 0 5; to_y: "base"; } - rel2.to_y: "bg"; image { normal: "bt_base1.png"; - border: 12 4 0 5; + border: 4 12 5 0; } fill.smooth: 0; } @@ -857,6 +823,36 @@ group { image.normal: "icon_arrow_up.png"; } } + part + { + name: "base"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + rel1.to: "bg"; + rel1.offset: -1 20; + rel2.to: "bg"; + image + { + normal: "bt_dis_base.png"; + border: 4 4 4 4; + } + } + } + part + { + name: "elm.swallow.content"; + type: SWALLOW; + clip_to: "clipper"; + description + { + state: "default" 0.0; + rel1.to: "clipper"; + rel2.to: "clipper"; + } + } } programs { @@ -1001,24 +997,6 @@ group { } part { - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - rel1.to: "bg"; - rel1.offset: 20 0; - rel2.to: "bg"; - image - { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } - } - } - part - { name: "clipper"; type: RECT; mouse_events: 0; @@ -1039,18 +1017,6 @@ group { } part { - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clipper"; - description - { - state: "default" 0.0; - rel1.to: "clipper"; - rel2.to: "clipper"; - } - } - part - { name: "btn"; type: IMAGE; mouse_events: 1; @@ -1172,6 +1138,36 @@ group { image.normal: "icon_arrow_left.png"; } } + part + { + name: "base"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + rel1.to: "bg"; + rel1.offset: 20 0; + rel2.to: "bg"; + image + { + normal: "bt_dis_base.png"; + border: 4 4 4 4; + } + } + } + part + { + name: "elm.swallow.content"; + type: SWALLOW; + clip_to: "clipper"; + description + { + state: "default" 0.0; + rel1.to: "clipper"; + rel2.to: "clipper"; + } + } } programs { -- 2.7.4