seoz pushed a commit to branch master.
commit fb73a52cb190b6ef4f895fd86cb260f322d52cec
Author: Daniel Juyung Seo <[email protected]>
Date: Tue Jul 23 16:12:55 2013 +0900
button.edc: remove unnecessary parts. event parts does not need to ignore
ON_HOLD flag because click event will be automatically ignored by edje when on
hold flag is set.
---
edje/edc/elm/button.edc | 42 ++----------------------------------------
1 file changed, 2 insertions(+), 40 deletions(-)
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index cdbe632..09b5ea9 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -17,14 +17,12 @@ group { name: "elm/button/base/default";
set_state(PART:"elm.text", "visible", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
set_state(PART:"sizer.content", "visible", 0.0);
set_state(PART:"elm.text", "disabled_visible", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
}
} else if (m1 == (ICON)) {
if (!d) {
@@ -33,14 +31,12 @@ group { name: "elm/button/base/default";
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
set_state(PART:"sizer.content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
}
} else if (m1 == (LABEL)) {
if (!d) {
@@ -49,14 +45,12 @@ group { name: "elm/button/base/default";
set_state(PART:"elm.text", "textonly", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
set_state(PART:"elm.text", "disabled_textonly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
}
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
@@ -64,7 +58,6 @@ group { name: "elm/button/base/default";
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
}
}
}
@@ -198,18 +191,6 @@ group { name: "elm/button/base/default";
}
}
part { name: "event"; type: RECT;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "event2"; type: RECT;
- mouse_events: 1;
- repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
}
@@ -230,7 +211,7 @@ group { name: "elm/button/base/default";
target: "base";
}
program {
- signal: "mouse,up,1"; source: "event2";
+ signal: "mouse,up,1"; source: "event";
action: SIGNAL_EMIT "elm,action,unpress" "";
after: "button_unclick_anim";
}
@@ -328,7 +309,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
set_state(PART:"sizer.content", "visible", 0.0);
@@ -336,7 +316,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"bar", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
}
} else if (m1 == (ICON)) {
if (!d) {
@@ -346,7 +325,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
set_state(PART:"sizer.content", "icononly", 0.0);
@@ -354,7 +332,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"bar", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
}
} else if (m1 == (LABEL)) {
if (!d) {
@@ -364,7 +341,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
@@ -372,7 +348,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"bar", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
}
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
@@ -381,7 +356,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
}
}
}
@@ -561,18 +535,6 @@ group { name: "elm/button/base/anchor";
}
}
part { name: "event"; type: RECT;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "event2"; type: RECT;
- mouse_events: 1;
- repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
}
@@ -595,7 +557,7 @@ group { name: "elm/button/base/anchor";
target: "text2";
}
program {
- signal: "mouse,up,1"; source: "event2";
+ signal: "mouse,up,1"; source: "event";
action: SIGNAL_EMIT "elm,action,unpress" "";
after: "button_unclick_anim";
}
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
