bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Elementary theme-bubble: revert 55839 that introduced bugs with no-icon. 

The commit caused bugs when there was no icon, exactly what it claimed
to have fixed. I took a look at the commit and it looked a bit messy,
too messy for me to try to fix. A rewrite makes more sense.

Previous commit message:
From: Sohyun Kim <anna1014.kim@samsung.com>
Subject: [E-devel] [Patch] elm_bubble theme patch

I'm Sohyun Kim. Nice to meet you.

This is a patch for bubble theme.

The bubble has a region for icon, label and info text.
However, it has the region, if icon, label and info text are not set.
I modified theme and added edje signals.

1. add edje signal for label and info text state
2. remove text size for label and info text default state
   -> set it on "visible" state
3. add base image state for info text only

SVN revision: 57244
This commit is contained in:
Sohyun Kim 2011-02-22 16:33:38 +00:00 committed by Tom Hacohen
parent 57934d16f1
commit 669bb5ba57
1 changed files with 12 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

268
legacy/elementary/data/themes/default.edc
View File

@ -9058,7 +9058,6 @@ collections {
description { state: "default" 0.0;
align: 0.0 0.0;
fixed: 0 1;
visible: 0;
rel1 {
to_x: "elm.swallow.icon";
relative: 1.0 0.0;
@ -9069,10 +9068,6 @@ collections {
relative: 0.0 0.0;
offset: -5 4;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 0 0 0 255;
text {
font: "Sans:style=Bold,Edje-Vera-Bold";
@ -9090,7 +9085,6 @@ collections {
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 1;
visible: 0;
rel1 {
relative: 1.0 0.0;
offset: -5 4;
@ -9099,10 +9093,6 @@ collections {
relative: 1.0 0.0;
offset: -5 4;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 0 0 0 64;
text {
font: "Sans:style=Bold,Edje-Vera-Bold";
@ -9128,10 +9118,6 @@ collections {
image.middle: SOLID;
fill.smooth: 0;
}
description { state: "infobase" 0.0;
inherit: "default" 0.0;
rel1.to_y: "elm.info";
}
}
part { name: "elm.swallow.content";
type: SWALLOW;
@ -9178,62 +9164,15 @@ collections {
name: "icon_show";
signal: "elm,state,icon,visible";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"base0", st, 30, vl);
if (!strcmp(st, "infobase"))
set_state(PART:"base0", "default", 0.0);
set_state(PART:"elm.swallow.icon", "visible", 0.0);
}
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
}
program {
name: "icon_hide";
signal: "elm,state,icon,hidden";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"elm.info", st, 30, vl);
if (!strcmp(st, "visible"))
set_state(PART:"base0", "infobase", 0.0);
set_state(PART:"elm.swallow.icon", "default", 0.0);
}
}
program {
name: "text_show";
signal: "elm,state,text,visible";
source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.text";
}
program {
name: "text_hide";
signal: "elm,state,text,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text";
}
program {
name: "info_show";
signal: "elm,state,info,visible";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"elm.swallow.icon", st, 30, vl);
if (!strcmp(st, "default"))
set_state(PART:"base0", "infobase", 0.0);
set_state(PART:"elm.info", "visible", 0.0);
}
}
program {
name: "info_hide";
signal: "elm,state,info,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.info";
target: "base0";
target: "elm.swallow.icon";
}
}
}
@ -9281,7 +9220,6 @@ collections {
description { state: "default" 0.0;
align: 0.0 0.0;
fixed: 0 1;
visible: 0;
rel1 {
relative: 0.0 0.0;
offset: 4 4;
@ -9291,10 +9229,6 @@ collections {
relative: 0.0 0.0;
offset: -5 4;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 0 0 0 255;
text {
font: "Sans:style=Bold,Edje-Vera-Bold";
@ -9312,7 +9246,6 @@ collections {
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 1;
visible: 0;
rel1 {
relative: 1.0 0.0;
offset: -5 4;
@ -9322,10 +9255,6 @@ collections {
relative: 0.0 0.0;
offset: -5 4;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 0 0 0 64;
text {
font: "Sans:style=Bold,Edje-Vera-Bold";
@ -9351,10 +9280,6 @@ collections {
image.middle: SOLID;
fill.smooth: 0;
}
description { state: "infobase" 0.0;
inherit: "default" 0.0;
rel1.to_y: "elm.info";
}
}
part { name: "elm.swallow.content";
type: SWALLOW;
@ -9401,62 +9326,15 @@ collections {
name: "icon_show";
signal: "elm,state,icon,visible";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"base0", st, 30, vl);
if (!strcmp(st, "infobase"))
set_state(PART:"base0", "default", 0.0);
set_state(PART:"elm.swallow.icon", "visible", 0.0);
}
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
}
program {
name: "icon_hide";
signal: "elm,state,icon,hidden";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"elm.info", st, 30, vl);
if (!strcmp(st, "visible"))
set_state(PART:"base0", "infobase", 0.0);
set_state(PART:"elm.swallow.icon", "default", 0.0);
}
}
program {
name: "text_show";
signal: "elm,state,text,visible";
source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.text";
}
program {
name: "text_hide";
signal: "elm,state,text,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text";
}
program {
name: "info_show";
signal: "elm,state,info,visible";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"elm.swallow.icon", st, 30, vl);
if (!strcmp(st, "default"))
set_state(PART:"base0", "infobase", 0.0);
set_state(PART:"elm.info", "visible", 0.0);
}
}
program {
name: "info_hide";
signal: "elm,state,info,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.info";
target: "base0";
target: "elm.swallow.icon";
}
}
}
@ -9504,7 +9382,6 @@ collections {
description { state: "default" 0.0;
align: 0.0 1.0;
fixed: 0 1;
visible: 0;
rel1 {
to_x: "elm.swallow.icon";
relative: 1.0 1.0;
@ -9515,10 +9392,6 @@ collections {
relative: 0.0 1.0;
offset: -5 -5;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 0 0 0 255;
text {
font: "Sans:style=Bold,Edje-Vera-Bold";
@ -9536,7 +9409,6 @@ collections {
description { state: "default" 0.0;
align: 1.0 1.0;
fixed: 1 1;
visible: 0;
rel1 {
relative: 1.0 1.0;
offset: -5 -5;
@ -9545,10 +9417,6 @@ collections {
relative: 1.0 1.0;
offset: -5 -5;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 0 0 0 64;
text {
font: "Sans:style=Bold,Edje-Vera-Bold";
@ -9574,10 +9442,6 @@ collections {
image.middle: SOLID;
fill.smooth: 0;
}
description { state: "infobase" 0.0;
inherit: "default" 0.0;
rel2.to_y: "elm.info";
}
}
part { name: "elm.swallow.content";
type: SWALLOW;
@ -9617,62 +9481,15 @@ collections {
name: "icon_show";
signal: "elm,state,icon,visible";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"base0", st, 30, vl);
if (!strcmp(st, "infobase"))
set_state(PART:"base0", "default", 0.0);
set_state(PART:"elm.swallow.icon", "visible", 0.0);
}
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
}
program {
name: "icon_hide";
signal: "elm,state,icon,hidden";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"elm.info", st, 30, vl);
if (!strcmp(st, "visible"))
set_state(PART:"base0", "infobase", 0.0);
set_state(PART:"elm.swallow.icon", "default", 0.0);
}
}
program {
name: "text_show";
signal: "elm,state,text,visible";
source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.text";
}
program {
name: "text_hide";
signal: "elm,state,text,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text";
}
program {
name: "info_show";
signal: "elm,state,info,visible";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"elm.swallow.icon", st, 30, vl);
if (!strcmp(st, "default"))
set_state(PART:"base0", "infobase", 0.0);
set_state(PART:"elm.info", "visible", 0.0);
}
}
program {
name: "info_hide";
signal: "elm,state,info,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.info";
target: "base0";
target: "elm.swallow.icon";
}
}
}
@ -9720,7 +9537,6 @@ collections {
description { state: "default" 0.0;
align: 0.0 1.0;
fixed: 0 1;
visible: 0;
rel1 {
relative: 0.0 1.0;
offset: 4 -5;
@ -9730,10 +9546,6 @@ collections {
relative: 0.0 1.0;
offset: -5 -5;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 0 0 0 255;
text {
font: "Sans:style=Bold,Edje-Vera-Bold";
@ -9751,7 +9563,6 @@ collections {
description { state: "default" 0.0;
align: 1.0 1.0;
fixed: 1 1;
visible: 0;
rel1 {
relative: 1.0 1.0;
offset: -5 -5;
@ -9761,10 +9572,6 @@ collections {
relative: 0.0 1.0;
offset: -5 -5;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 0 0 0 64;
text {
font: "Sans:style=Bold,Edje-Vera-Bold";
@ -9790,10 +9597,6 @@ collections {
image.middle: SOLID;
fill.smooth: 0;
}
description { state: "infobase" 0.0;
inherit: "default" 0.0;
rel2.to_y: "elm.info";
}
}
part { name: "elm.swallow.content";
type: SWALLOW;
@ -9833,62 +9636,15 @@ collections {
name: "icon_show";
signal: "elm,state,icon,visible";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"base0", st, 30, vl);
if (!strcmp(st, "infobase"))
set_state(PART:"base0", "default", 0.0);
set_state(PART:"elm.swallow.icon", "visible", 0.0);
}
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
}
program {
name: "icon_hide";
signal: "elm,state,icon,hidden";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"elm.info", st, 30, vl);
if (!strcmp(st, "visible"))
set_state(PART:"base0", "infobase", 0.0);
set_state(PART:"elm.swallow.icon", "default", 0.0);
}
}
program {
name: "text_show";
signal: "elm,state,text,visible";
source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.text";
}
program {
name: "text_hide";
signal: "elm,state,text,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text";
}
program {
name: "info_show";
signal: "elm,state,info,visible";
source: "elm";
script {
new st[31];
new Float:vl;
get_state(PART:"elm.swallow.icon", st, 30, vl);
if (!strcmp(st, "default"))
set_state(PART:"base0", "infobase", 0.0);
set_state(PART:"elm.info", "visible", 0.0);
}
}
program {
name: "info_hide";
signal: "elm,state,info,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.info";
target: "base0";
target: "elm.swallow.icon";
}
}
}