[fastscroll] changed theme according to winset GUI ver5.1

Change-Id: Ibd9f7d17130f483b8cd739e23a576e0bad86bc70

diff --git a/themes/images/tizen-hd/Controls/00_fast_scroll_rollover_bg.png b/themes/images/tizen-hd/Controls/00_fast_scroll_rollover_bg.png
old mode 100644 (file)
new mode 100755 (executable)
index 92e5e0e..53da3ed
Binary files a/themes/images/tizen-hd/Controls/00_fast_scroll_rollover_bg.png and b/themes/images/tizen-hd/Controls/00_fast_scroll_rollover_bg.png differ

diff --git a/themes/images/tizen-hd/Controls/00_fast_scroll_rollover_bg_focus.png b/themes/images/tizen-hd/Controls/00_fast_scroll_rollover_bg_focus.png
deleted file mode 100644 (file)
index 53da3ed..0000000
Binary files a/themes/images/tizen-hd/Controls/00_fast_scroll_rollover_bg_focus.png and /dev/null differ

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 1ab26d9..235c86e 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -655,7 +655,7 @@
 #define INDEX_POPUP_TEXT_SIZE_INC 136
 #define INDEX_ROLLOVER_TEXT_COLOR_INC 160 159 154 255
 #define INDEX_ROLLOVER_ACTIVE_TEXT_COLOR_INC 59 115 182 255
-#define INDEX_BOTTOM_LINE_COLOR_INC 197 194 183 255
+#define INDEX_DIVIDER_COLOR_INC 226 223 213 255
 #define INDEX_BOTTOM_LINE_WIDTH_INC 1
 #define INDEX_LEFT_LINE_COLOR_INC 65 119 184 255
 #define INDEX_LEFT_LINE_WIDTH_INC 3

diff --git a/themes/widgets/index.edc b/themes/widgets/index.edc
index 72f7195..5ee605e 100644 (file)
--- a/themes/widgets/index.edc
+++ b/themes/widgets/index.edc
@@ -19,12 +19,17 @@
 
    group { name: "elm/index/base/vertical/default";
       script {
-         public timer_id, timer_flag;
+         public timer_id, timer_flag, timer_id_2, timer_flag_2;
          public index_hide_timer(val) {
             if (get_int(timer_flag) == 1)
                run_program(PROGRAM:"index0.hide");
             return 0;
          }
+         public left_line_hide_timer(val) {
+            if (get_int(timer_flag_2) == 1)
+               run_program(PROGRAM:"left.line.dim");
+            return 0;
+         }
       }
       images {
          image: "00_fast_scroll_rollover_bg.png" COMP;
@@ -124,15 +129,9 @@
             clip_to: "clip";
             scale: 1;
             description { state: "default" 0.0;
-               rel1 {
-                  to: "index.top.padding";
-               }
-               rel2 {
-                  to: "index.bottom.padding";
-               }
-               image {
-                  normal: "00_fast_scroll_rollover_bg.png";
-               }
+               rel1.to: "index.top.padding";
+               rel2.to: "index.bottom.padding";
+               image.normal: "00_fast_scroll_rollover_bg.png";
             }
          }
          part { name: "left.line";
@@ -151,6 +150,10 @@
                   to: "bg";
                   relative: 0.0 1.0;
                }
+               color: INDEX_DIVIDER_COLOR_INC;
+            }
+            description { state: "active" 0.0;
+               inherit: "default" 0.0;
                color: INDEX_LEFT_LINE_COLOR_INC;
             }
          }
@@ -368,6 +371,7 @@
             source: "";
             script {
                run_program(PROGRAM:"initial.index0.active");
+               run_program(PROGRAM:"initial.left.line.active");
             }
          }
          program { name: "drag2";
@@ -381,6 +385,11 @@
                set_state_val(PART:"elm.dragable.index.1", STATE_ALIGNMENT, 0.5, dy);
             }
          }
+         program { name: "initial.index0.active";
+            action: STATE_SET "active" 0.0;
+            target: "clip";
+            after: "index0.inactive";
+         }
          program { name: "index0.active";
             signal: "elm,state,active";
             source: "elm";
@@ -388,11 +397,6 @@
             target: "clip";
             after: "disable_timer";
          }
-         program { name: "initial.index0.active";
-            action: STATE_SET "active" 0.0;
-            target: "clip";
-            after: "index0.inactive";
-         }
          program { name: "index0.inactive";
             signal: "elm,state,inactive";
             source: "elm";
@@ -411,6 +415,36 @@
             target: "clip";
             after: "disable_timer";
          }
+         program { name: "initial.left.line.active";
+            action: STATE_SET "active" 0.0;
+            target: "left.line";
+            after: "left.line.inactive";
+         }
+         program { name: "left.line.active";
+            signal: "mouse,down,1";
+            source: "elm.swallow.event.0";
+            action: STATE_SET "active" 0.0;
+            target: "left.line";
+            after: "disable_timer_2";
+         }
+         program { name: "left.line.inactive";
+            signal: "mouse,up,1";
+            source: "elm.swallow.event.0";
+            script {
+               new v;
+               v = get_int(timer_id_2);
+               if (v > 0) cancel_timer(v);
+               run_program(PROGRAM:"enable_timer_2");
+               v = timer(2.0, "left_line_hide_timer", 0);
+               set_int(timer_id_2, v);
+            }
+         }
+         program { name: "left.line.dim";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.3;
+            target: "left.line";
+            after: "disable_timer_2";
+         }
          program { name: "index.active";
             signal: "elm,indicator,state,active";
             source: "elm";
@@ -448,6 +482,16 @@
                set_int(timer_flag, 1);
             }
          }
+         program { name: "disable_timer_2";
+            script {
+               set_int(timer_flag_2, 0);
+            }
+         }
+         program { name: "enable_timer_2";
+            script {
+               set_int(timer_flag_2, 1);
+            }
+         }
       }
    }
 
@@ -456,7 +500,7 @@
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       images {
-         image: "00_fast_scroll_rollover_bg_focus.png" COMP;
+         image: "00_fast_scroll_rollover_bg.png" COMP;
          image: "00_fast_scroll_rollover_bg_line_focus.png" COMP;
       }
       parts {
@@ -468,7 +512,7 @@
                rel1.to: "elm.text";
                rel2.to: "elm.text";
                image {
-                  normal: "00_fast_scroll_rollover_bg_focus.png";
+                  normal: "00_fast_scroll_rollover_bg.png";
                }
                visible: 0;
             }
@@ -477,7 +521,7 @@
                visible: 1;
             }
          }
-         part { name: "bottom.line";
+         part { name: "divider";
             type: RECT;
             mouse_events: 0;
             scale: 1;
@@ -494,7 +538,7 @@
                   relative: 1.0 1.0;
                   offset: -3 0;
                }
-               color: INDEX_BOTTOM_LINE_COLOR_INC;
+               color: INDEX_DIVIDER_COLOR_INC;
             }
             description {
                state: "inactive" 0.0;
@@ -531,11 +575,11 @@
                fixed: 1 1;
                visible: 0;
                rel1 {
-                  to: "bottom.line";
+                  to: "divider";
                   relative: 0.0 0.0;
                }
                rel2 {
-                  to: "bottom.line";
+                  to: "divider";
                   relative: 1.0 0.0;
                }
             }
@@ -593,12 +637,8 @@
                min: INDEX_ITEM_WIDTH_INC INDEX_ITEM_HEIGHT_INC;
                align: 0.5 0.5;
                state: "default" 0.0;
-               rel1 {
-                  relative: 0.0  0.0;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-               }
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
                color: INDEX_ROLLOVER_TEXT_COLOR_INC;
                text {
                   font: "Tizen:style=Bold";
@@ -636,7 +676,7 @@
             signal: "elm,last,item";
             source: "elm";
             action: STATE_SET "inactive" 0.0;
-            target: "bottom.line";
+            target: "divider";
          }
       }
    }