From c214b769d8d83bd222447f39e150fdcbed5fac11 Mon Sep 17 00:00:00 2001 From: Mykyta Biliavskyi Date: Tue, 8 Nov 2016 16:36:21 +0200 Subject: [PATCH] Default theme: remove wrong targets from program. Some of styles contain STATE_SET programs, that try to switch part into non existents description. For desctop application, such as Enventor and Eflete this make launch and work slow. This commit fix this situation by removing wrong targets or add missed states into target parts. Change-Id: Ia9f51afaa096cadff363d7ea28d40059b5be04a2 Signed-off-by: Mykyta Biliavskyi --- data/themes/edc/elm/button.edc | 10 ++++------ data/themes/edc/elm/menu.edc | 10 ---------- data/themes/edc/elm/scroller.edc | 4 ---- data/themes/edc/elm/segment_control.edc | 1 - data/themes/edc/elm/slider.edc | 10 ---------- 5 files changed, 4 insertions(+), 31 deletions(-) diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc index 0088b6d..d34b67a 100644 --- a/data/themes/edc/elm/button.edc +++ b/data/themes/edc/elm/button.edc @@ -58,13 +58,11 @@ group { name: "elm/button/base/default"; if (!d) { set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "icononly", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"event", "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", "icononly", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } @@ -371,14 +369,12 @@ group { name: "elm/button/base/anchor"; if (!d) { set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "icononly", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "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", "icononly", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"bar", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); @@ -867,6 +863,10 @@ group { name: "elm/button/base/hoversel_vertical/default"; visible: 1; fixed: 0 0; } + desc { "icononly"; + inherit: "default" 0.0; + visible: 0; + } } image { "select_line"; nomouse; desc { "default"; @@ -966,13 +966,11 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; if (!d) { set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "icononly", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"event", "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", "icononly", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } diff --git a/data/themes/edc/elm/menu.edc b/data/themes/edc/elm/menu.edc index d7a7161..956d8cd 100644 --- a/data/themes/edc/elm/menu.edc +++ b/data/themes/edc/elm/menu.edc @@ -1133,16 +1133,6 @@ group { name: "elm/hover/base/main_menu_submenu/default"; signal: "mouse,up,*"; source: "base"; action: SIGNAL_EMIT "elm,action,dismiss" "elm"; } - program { name: "show"; - signal: "elm,action,show"; source: "elm"; - action: STATE_SET "visible" 0.0; - target: "base"; - } - program { name: "hide"; - signal: "elm,action,hide"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - } program { name: "bottomshow"; signal: "elm,action,slot,bottom,show"; source: "elm"; action: STATE_SET "visible" 0.0; diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc index 34fa910..462ad35 100644 --- a/data/themes/edc/elm/scroller.edc +++ b/data/themes/edc/elm/scroller.edc @@ -1136,7 +1136,6 @@ group { name: "elm/scroller/base/default"; program { signal: "mouse,down,1*"; source: "elm.dragable.vbar"; action: STATE_SET "clicked" 0.0; - target: "elm.dragable.vbar"; target: "shadow_vbar"; target: "glow_vbar"; target: "center_glow_vbar"; @@ -1148,7 +1147,6 @@ group { name: "elm/scroller/base/default"; program { signal: "mouse,up,1"; source: "elm.dragable.vbar"; action: STATE_SET "default" 0.0; - target: "elm.dragable.vbar"; target: "shadow_vbar"; target: "glow_vbar"; target: "center_glow_vbar"; @@ -1160,7 +1158,6 @@ group { name: "elm/scroller/base/default"; program { signal: "mouse,down,1*"; source: "elm.dragable.hbar"; action: STATE_SET "clicked" 0.0; - target: "elm.dragable.hbar"; target: "shadow_hbar"; target: "glow_hbar"; target: "center_glow_hbar"; @@ -1172,7 +1169,6 @@ group { name: "elm/scroller/base/default"; program { signal: "mouse,up,1"; source: "elm.dragable.hbar"; action: STATE_SET "default" 0.0; - target: "elm.dragable.hbar"; target: "shadow_hbar"; target: "glow_hbar"; target: "center_glow_hbar"; diff --git a/data/themes/edc/elm/segment_control.edc b/data/themes/edc/elm/segment_control.edc index 8213965..fdc7b84 100644 --- a/data/themes/edc/elm/segment_control.edc +++ b/data/themes/edc/elm/segment_control.edc @@ -288,7 +288,6 @@ group { name: "elm/segment_control/item/default"; set_state(PART:"disabler", "default", 0.0); } else { set_state(PART:"elm.text", "disabled", 0.0); - set_state(PART:"text2", "normal", 0.0); set_state(PART:"disabler", "disabled", 0.0); if(type == SEGMENT_TYPE_SINGLE) set_state(PART:"segment", "default_single", 0.0); diff --git a/data/themes/edc/elm/slider.edc b/data/themes/edc/elm/slider.edc index b39a680..4e2a490 100644 --- a/data/themes/edc/elm/slider.edc +++ b/data/themes/edc/elm/slider.edc @@ -722,16 +722,6 @@ group { name: "elm/slider/horizontal/indicator/default"; target: "elm.indicator"; target: "bevel"; } - program { - signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "base"; - } - program { - signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - } } } -- 2.7.4