diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-06-08 14:26:15 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-06-08 14:54:47 -0400 |
| commit | 88edbef366e1ddea5fbe271691b68c683c88b92e (patch) | |
| tree | bc3bae0e3b4685aa1706674e61657a828caf1411 | |
| parent | 9d8e54d3938f7fa50d811dcf44dcb060ffa4eb61 (diff) | |
| download | elementary-88edbef366e1ddea5fbe271691b68c683c88b92e.tar.gz | |
shelf: use spacer for content sizing, toggle content visibility
| -rw-r--r-- | data/themes/edc/shelf.edc | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/data/themes/edc/shelf.edc b/data/themes/edc/shelf.edc index 13e84c398..f4718ceb1 100644 --- a/data/themes/edc/shelf.edc +++ b/data/themes/edc/shelf.edc @@ -76,7 +76,7 @@ group { name: "e/shelf/default/base"; nomouse; FIXED_SIZE(14, 4) } } - part { name: "e.swallow.content"; type: SWALLOW; mouse; + spacer { "sizer"; description { state: "default" 0.0; rel1.offset: 1 0; rel1.relative: 1.0 0.0; @@ -94,6 +94,16 @@ group { name: "e/shelf/default/base"; nomouse; rel2.relative: 1.0 0.0; } } + part { name: "e.swallow.content"; type: SWALLOW; mouse; + desc { + rel.to: "sizer"; + link.base: "e,state,visible" "e"; + } + desc { "hidden"; hid; + rel.to: "sizer"; + link.base: "e,state,hidden" "e"; + } + } part { name: "shine"; description { state: "default" 0.0; image.normal: "shine.png"; @@ -112,7 +122,7 @@ group { name: "e/shelf/default/base"; nomouse; signal: "e,state,orientation,"_ORIENT; source: "e"; \ action: STATE_SET _STATE 0.0; \ target: "bg"; \ - target: "e.swallow.content"; \ + target: "sizer"; \ target: "dots_start"; \ target: "dots_end"; \ } @@ -160,8 +170,7 @@ group { name: "e/shelf/default/inset"; nomouse; color: 255 255 255 255; } } - part { name: "e.swallow.content"; type: SWALLOW; mouse; - clip_to: "clip"; + spacer { "sizer"; description { state: "default" 0.0; rel1.offset: 4 1; rel2.offset: -5 -2; @@ -171,6 +180,17 @@ group { name: "e/shelf/default/inset"; nomouse; rel2.offset: -2 -5; } } + part { name: "e.swallow.content"; type: SWALLOW; mouse; + clip_to: "clip"; + desc { + rel.to: "sizer"; + link.base: "e,state,visible" "e"; + } + desc { "hidden"; hid; + rel.to: "sizer"; + link.base: "e,state,hidden" "e"; + } + } part { name: "inset"; description { state: "default" 0.0; rel1.offset: 2 0; @@ -198,7 +218,7 @@ group { name: "e/shelf/default/inset"; nomouse; program { \ signal: "e,state,orientation,"_ORIENT; source: "e"; \ action: STATE_SET _STATE 0.0; \ - target: "e.swallow.content"; \ + target: "sizer"; \ target: "inset"; \ target: "clip"; \ } @@ -322,13 +342,23 @@ group { name: "e/shelf/default/plain"; nomouse; color: 255 255 255 255; } } - part { name: "e.swallow.content"; type: SWALLOW; mouse; - clip_to: "clip"; - description { state: "default" 0.0; + spacer { "sizer"; + desc { rel1.offset: 1 1; rel2.offset: -2 -2; } } + part { name: "e.swallow.content"; type: SWALLOW; mouse; + clip_to: "clip"; + desc { + rel.to: "sizer"; + link.base: "e,state,visible" "e"; + } + desc { "hidden"; hid; + rel.to: "sizer"; + link.base: "e,state,hidden" "e"; + } + } rect { "events"; repeat; mouse; desc { color: 0 0 0 0; } } |