shelf: use spacer for content sizing, toggle content visibility

This commit is contained in:
Mike Blumenkrantz 2015-06-08 14:26:15 -04:00
parent f73944df11
commit 9d6ac3696c
1 changed files with 38 additions and 8 deletions

View File

@ -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; }
}