summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorOlliver Schinagl <o.schinagl@ultimaker.com>2015-04-24 05:10:58 (GMT)
committerOlliver Schinagl <o.schinagl@ultimaker.com>2015-04-28 05:07:15 (GMT)
commit6acecb90833642a627637129cd7fc08f123e7fc8 (patch)
treeb7d9f3337dd9b7079651e8132f3d9d6aaa501e4f /data
parent7cb08d692f5ae2e65fc9f911bcd50fb5c4967c7c (diff)
downloadeulogium-6acecb90833642a627637129cd7fc08f123e7fc8.zip
eulogium-6acecb90833642a627637129cd7fc08f123e7fc8.tar.gz
eulogium-6acecb90833642a627637129cd7fc08f123e7fc8.tar.bz2
Remove (un)focusED callbacks and edje signals, use focus instead
By default elementary already emits an elm,action,focus signal. Using our own signal handler and signal 'focused' was good for a proof of concept, but is no longer needed as we can respond to the stock signals. Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
Diffstat (limited to 'data')
-rw-r--r--data/themes/default/edc/elm/button.edc22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/themes/default/edc/elm/button.edc b/data/themes/default/edc/elm/button.edc
index 4cd6555..9333a06 100644
--- a/data/themes/default/edc/elm/button.edc
+++ b/data/themes/default/edc/elm/button.edc
@@ -79,7 +79,7 @@ group { name: "elm/button/base/default";
rel2.offset: -1 -1;
fill.smooth: 0;
}
- description { state: "focused" 0.0;
+ description { state: "focus" 0.0;
inherit: "default" 0.0;
image.normal: "button_normal.png";
}
@@ -171,15 +171,15 @@ group { name: "elm/button/base/default";
}
visible: 0;
}
- description { state: "focused" 0.0;
+ description { state: "focus" 0.0;
inherit: "default" 0.0;
-// color_class: "button_text_focused";
- color: 0 0 255 255;
+// color_class: "button_text_focus";
+ color: 0 0 0 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- // color_class: "button_text_focused";
- color: 0 0 255 255;
+ // color_class: "button_text_focus";
+ color: 0 0 0 255;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -221,14 +221,14 @@ group { name: "elm/button/base/default";
}
}
programs {
- program { name: "button_unfocused"; source: "elm";
- signal: "elm,state,unfocused"; source: "elm";
+ program { name: "button_unfocus"; source: "elm";
+ signal: "elm,action,unfocus"; source: "elm";
action: STATE_SET "default" 0.0;
target: "base";
}
- program { name: "button_focused"; source: "elm";
- signal: "elm,state,focused"; source: "elm";
- action: STATE_SET "focused" 0.0;
+ program { name: "button_focus"; source: "elm";
+ signal: "elm,action,focus"; source: "elm";
+ action: STATE_SET "focus" 0.0;
target: "base";
}
program {