diff options
author | Youngbok Shin <youngb.shin@samsung.com> | 2016-01-06 19:38:05 +0900 |
---|---|---|
committer | Jaehwan Kim <jae.hwan.kim@samsung.com> | 2016-01-06 19:38:05 +0900 |
commit | 352ba03e2cd782f7e2626a3f9462aef40faa3b34 (patch) | |
tree | 041ab946b33b9992bbc21b9a5abbfa834de9f234 /data | |
parent | e2dbc58480bf0a53db83d340b6b332f441e3e236 (diff) | |
download | elementary-352ba03e2cd782f7e2626a3f9462aef40faa3b34.tar.gz |
toolbar: Revert a theme change for shrink mode signals.
Summary:
It was changed for testing shrink mode signals.
But, it was unnecessary change for default theme.
Test Plan: N/A
Reviewers: zmike, jaehwan
Differential Revision: https://phab.enlightenment.org/D3536
Diffstat (limited to 'data')
-rw-r--r-- | data/themes/edc/elm/toolbar.edc | 90 |
1 files changed, 6 insertions, 84 deletions
diff --git a/data/themes/edc/elm/toolbar.edc b/data/themes/edc/elm/toolbar.edc index f6cb53364..d932ff24b 100644 --- a/data/themes/edc/elm/toolbar.edc +++ b/data/themes/edc/elm/toolbar.edc @@ -379,8 +379,6 @@ group { name: "elm/toolbar/item/default"; #define DISABLE 4 script { public btmode; - public vertical = 0; - public scroll = 0; public eval_mode(m) { new m1 = m & MASK; new d = m & DISABLE; @@ -434,44 +432,6 @@ group { name: "elm/toolbar/item/default"; } } } - - public enable_scroll() { - set_int(scroll, 1); - - if (get_int(vertical)) - set_state(PART:"base", "vert_scroll", 0.0); - else - set_state(PART:"base", "scroll", 0.0); - } - - public disable_scroll() { - set_int(scroll, 0); - - if (get_int(vertical)) - set_state(PART:"base", "vert", 0.0); - else - set_state(PART:"base", "default", 0.0); - } - - public enable_vertical() { - set_int(vertical, 1); - - if (get_int(scroll)) - set_state(PART:"base", "vert_scroll", 0.0); - else - set_state(PART:"base", "vert", 0.0); - set_state(PART:"bend_clip", "vert", 0.0); - } - - public disable_vertical() { - set_int(vertical, 0); - - if (get_int(scroll)) - set_state(PART:"base", "scroll", 0.0); - else - set_state(PART:"base", "default", 0.0); - set_state(PART:"bend_clip", "default", 0.0); - } } parts { part { name: "base"; type: SPACER; @@ -481,14 +441,6 @@ group { name: "elm/toolbar/item/default"; rel1.offset: -1 0; rel2.offset: 0 -1; } - description { state: "scroll" 0.0; - inherit: "default" 0.0; - min: 80 0; - } - description { state: "vert_scroll" 0.0; - inherit: "vert" 0.0; - min: 0 80; - } } part { name: "shadow1"; mouse_events: 0; description { state: "default" 0.0; @@ -858,45 +810,15 @@ group { name: "elm/toolbar/item/default"; programs { program { signal: "elm,orient,horizontal"; source: "elm"; - script { - disable_vertical(); - } + action: STATE_SET "default" 0.0; + target: "base"; + target: "bend_clip"; } program { signal: "elm,orient,vertical"; source: "elm"; - script { - enable_vertical(); - } - } - program { - signal: "elm,state,shrink,scroll"; source: "elm"; - script { - enable_scroll(); - } - } - program { - signal: "elm,state,shrink,none"; source: "elm"; - script { - disable_scroll() - } - } - program { - signal: "elm,state,shrink,hide"; source: "elm"; - script { - disable_scroll() - } - } - program { - signal: "elm,state,shrink,menu"; source: "elm"; - script { - disable_scroll() - } - } - program { - signal: "elm,state,shrink,expand"; source: "elm"; - script { - disable_scroll() - } + action: STATE_SET "vert" 0.0; + target: "base"; + target: "bend_clip"; } program { name: "st0"; |