summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2016-01-06 19:38:05 +0900
committerJaehwan Kim <jae.hwan.kim@samsung.com>2016-01-06 19:38:05 +0900
commit352ba03e2cd782f7e2626a3f9462aef40faa3b34 (patch)
tree041ab946b33b9992bbc21b9a5abbfa834de9f234
parente2dbc58480bf0a53db83d340b6b332f441e3e236 (diff)
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
-rw-r--r--data/themes/edc/elm/toolbar.edc90
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";
379#define DISABLE 4 379#define DISABLE 4
380 script { 380 script {
381 public btmode; 381 public btmode;
382 public vertical = 0;
383 public scroll = 0;
384 public eval_mode(m) { 382 public eval_mode(m) {
385 new m1 = m & MASK; 383 new m1 = m & MASK;
386 new d = m & DISABLE; 384 new d = m & DISABLE;
@@ -434,44 +432,6 @@ group { name: "elm/toolbar/item/default";
434 } 432 }
435 } 433 }
436 } 434 }
437
438 public enable_scroll() {
439 set_int(scroll, 1);
440
441 if (get_int(vertical))
442 set_state(PART:"base", "vert_scroll", 0.0);
443 else
444 set_state(PART:"base", "scroll", 0.0);
445 }
446
447 public disable_scroll() {
448 set_int(scroll, 0);
449
450 if (get_int(vertical))
451 set_state(PART:"base", "vert", 0.0);
452 else
453 set_state(PART:"base", "default", 0.0);
454 }
455
456 public enable_vertical() {
457 set_int(vertical, 1);
458
459 if (get_int(scroll))
460 set_state(PART:"base", "vert_scroll", 0.0);
461 else
462 set_state(PART:"base", "vert", 0.0);
463 set_state(PART:"bend_clip", "vert", 0.0);
464 }
465
466 public disable_vertical() {
467 set_int(vertical, 0);
468
469 if (get_int(scroll))
470 set_state(PART:"base", "scroll", 0.0);
471 else
472 set_state(PART:"base", "default", 0.0);
473 set_state(PART:"bend_clip", "default", 0.0);
474 }
475 } 435 }
476 parts { 436 parts {
477 part { name: "base"; type: SPACER; 437 part { name: "base"; type: SPACER;
@@ -481,14 +441,6 @@ group { name: "elm/toolbar/item/default";
481 rel1.offset: -1 0; 441 rel1.offset: -1 0;
482 rel2.offset: 0 -1; 442 rel2.offset: 0 -1;
483 } 443 }
484 description { state: "scroll" 0.0;
485 inherit: "default" 0.0;
486 min: 80 0;
487 }
488 description { state: "vert_scroll" 0.0;
489 inherit: "vert" 0.0;
490 min: 0 80;
491 }
492 } 444 }
493 part { name: "shadow1"; mouse_events: 0; 445 part { name: "shadow1"; mouse_events: 0;
494 description { state: "default" 0.0; 446 description { state: "default" 0.0;
@@ -858,45 +810,15 @@ group { name: "elm/toolbar/item/default";
858 programs { 810 programs {
859 program { 811 program {
860 signal: "elm,orient,horizontal"; source: "elm"; 812 signal: "elm,orient,horizontal"; source: "elm";
861 script { 813 action: STATE_SET "default" 0.0;
862 disable_vertical(); 814 target: "base";
863 } 815 target: "bend_clip";
864 } 816 }
865 program { 817 program {
866 signal: "elm,orient,vertical"; source: "elm"; 818 signal: "elm,orient,vertical"; source: "elm";
867 script { 819 action: STATE_SET "vert" 0.0;
868 enable_vertical(); 820 target: "base";
869 } 821 target: "bend_clip";
870 }
871 program {
872 signal: "elm,state,shrink,scroll"; source: "elm";
873 script {
874 enable_scroll();
875 }
876 }
877 program {
878 signal: "elm,state,shrink,none"; source: "elm";
879 script {
880 disable_scroll()
881 }
882 }
883 program {
884 signal: "elm,state,shrink,hide"; source: "elm";
885 script {
886 disable_scroll()
887 }
888 }
889 program {
890 signal: "elm,state,shrink,menu"; source: "elm";
891 script {
892 disable_scroll()
893 }
894 }
895 program {
896 signal: "elm,state,shrink,expand"; source: "elm";
897 script {
898 disable_scroll()
899 }
900 } 822 }
901 823
902 program { name: "st0"; 824 program { name: "st0";