Merge "[slider.edc] Slider's default style is changed - default style ignores tapping...

diff --git a/themes/widgets/controlbar.edc b/themes/widgets/controlbar.edc
index 9858068..173c912 100644 (file)
--- a/themes/widgets/controlbar.edc
+++ b/themes/widgets/controlbar.edc
@@ -43,7 +43,6 @@
 
        group{
                name: "elm/controlbar/base/default";
-               alias: "elm/controlbar/base/naviframe";
 
                parts{
                        part{
@@ -189,7 +188,6 @@
 
        group{
                name: "elm/controlbar/background/default";
-               alias: "elm/controlbar/background/naviframe";
 
                parts{
                        part{
@@ -255,7 +253,6 @@
 
        group{
                name: "elm/controlbar/view/default";
-               alias: "elm/controlbar/view/naviframe";
 
                parts{
                        part{
@@ -283,7 +280,6 @@
 
        group{
                name: "elm/controlbar/item_bg/default";
-               alias: "elm/controlbar/item_bg/naviframe";
 
                parts{
                        part{
@@ -581,7 +577,6 @@
 
        group{
                name: "elm/controlbar/item_bg_move/default";
-               alias: "elm/controlbar/item_bg_move/naviframe";
 
                parts{
                        part{
@@ -598,14 +593,14 @@
                                description{
                                        state: "left" 0.0;
                                        visible: 1;
-                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.normal: "00_winset_tabbar_focus_left.png";
                                        image.border: 2 3 2 2;
                                        fill.smooth: 0;
                                }
                                description{
                                        state: "right" 0.0;
                                        visible: 1;
-                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.normal: "00_winset_tabbar_focus_right.png";
                                        image.border: 3 2 2 2;
                                        fill.smooth: 0;
                                }
@@ -724,3 +719,496 @@
                }
        }
 
+       group{
+               name: "elm/controlbar/base/naviframe";
+
+               parts{
+                       part{
+                               name: "bg_rect";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events:0;
+                               description{
+                                       state: "default" 0.0;
+                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
+                                       color: 0 0 0 0;
+                               }
+                       }
+                       part{
+                               name: "bg_image";
+                               type: SWALLOW;
+                               scale: 1;
+                               mouse_events:0;
+                               description{
+                                       state: "default" 0.0;
+                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
+                               }
+                               description{
+                                       state: "large" 0.0;
+                                       min: 0 CONTROLBAR_LARGE_HEIGHT_INC;
+                                       fixed: 0 1;
+                                       align: 0.5 1.0;
+                                       rel1 {relative: 0.0 1.0; offset: 0 -1;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
+                               }
+                               description{
+                                       state: "small" 0.0;
+                                       min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+                                       fixed: 0 1;
+                                       align: 0.5 1.0;
+                                       rel1 {relative: 0.0 1.0; offset: 0 -1;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
+                               }
+                               description{
+                                       state: "left" 0.0;
+                                       min: CONTROLBAR_WIDTH_INC 0;
+                                       fixed: 1 0;
+                                       align: 0.0 0.5;
+                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
+                                       rel2 {relative: 0.0 1.0; offset: 0 -1;}
+                               }
+                               description{
+                                       state: "right" 0.0;
+                                       min: CONTROLBAR_WIDTH_INC 0;
+                                       fixed: 1 0;
+                                       align: 1.0 0.5;
+                                       rel1 {relative: 1.0 0.0; offset: -1 0;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
+                               }
+                       }
+                       part {
+                               name: "elm.dragable.box";
+                               type: GROUP;
+                               source: "elm/controlbar/item_bg_move/default";
+                               mouse_events: 0;
+                               scale: 1;
+                               dragable {
+                                       x: 1 1 0;
+                                       y: 1 1 0;
+                                       confine: "bg_image";
+                               }
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 {
+                                               relative: 0.0 0.0;
+                                               to: "bg_image";
+                                       }
+                                       rel2 {
+                                               relative: 0.0 1.0;
+                                               to: "bg_image";
+                                       }
+                                       color: 0 0 0 0;
+                               }
+                       }
+                       part{
+                               name: "elm.swallow.items";
+                               type: SWALLOW;
+                               scale: 1;
+                               description{
+                                       state: "default" 0.0;
+                                       rel1 {relative: 0.0 0.0; offset: 5 0; to: "bg_image";}
+                                       rel2 {relative: 1.0 1.0; offset: -6 -1; to: "bg_image";}
+                               }
+                       }
+               }
+               programs{
+                       program{
+                               name: "default";
+                               signal: "elm,state,default";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "bg_image";
+                       }
+                       program{
+                               name: "large";
+                               signal: "elm,state,large";
+                               source: "elm";
+                               action: STATE_SET "large" 0.0;
+                               target: "bg_image";
+                       }
+                       program{
+                               name: "small";
+                               signal: "elm,state,small";
+                               source: "elm";
+                               action: STATE_SET "small" 0.0;
+                               target: "bg_image";
+                       }
+                       program{
+                               name: "left";
+                               signal: "elm,state,left";
+                               source: "elm";
+                               action: STATE_SET "left" 0.0;
+                               target: "bg_image";
+                       }
+                       program{
+                               name: "right";
+                               signal: "elm,state,right";
+                               source: "elm";
+                               action: STATE_SET "right" 0.0;
+                               target: "bg_image";
+                       }
+               }
+       }
+
+       group{
+               name: "elm/controlbar/background/naviframe";
+
+               parts{
+                       part{
+                               name: "bg_image";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events:0;
+                               description{
+                                       state: "default" 0.0;
+                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
+                                       color: 255 255 255 0;
+                               }
+                               description{
+                                       state: "tabbar" 0.0;
+                                       inherit: "default" 0.0;
+                               }
+                               description{
+                                       state: "tabbar_left" 0.0;
+                                       inherit: "default" 0.0;
+                               }
+                               description{
+                                       state: "tabbar_right" 0.0;
+                                       inherit: "default" 0.0;
+                               }
+                       }
+               }
+               programs {
+                       program {
+                               name: "tabbar_bg";
+                               signal: "elm,state,tabbar";
+                               source: "elm";
+                               action: STATE_SET "tabbar" 0.0;
+                               target: "bg_image";
+                       }
+                       program {
+                               name: "toolbar_bg";
+                               signal: "elm,state,toolbar";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "bg_image";
+                       }
+                       program {
+                               name: "tabbar_left_bg";
+                               signal: "elm,state,tabbar_left";
+                               source: "elm";
+                               action: STATE_SET "tabbar_left" 0.0;
+                               target: "bg_image";
+                       }
+                       program {
+                               name: "tabbar_right_bg";
+                               signal: "elm,state,tabbar_right";
+                               source: "elm";
+                               action: STATE_SET "tabbar_right" 0.0;
+                               target: "bg_image";
+                       }
+               }
+       }
+
+       group{
+               name: "elm/controlbar/item_bg/naviframe";
+               images{
+                       image: "00_winset_tabbar_press.png" COMP;
+                       image: "00_winset_tabbar_press_left.png" COMP;
+                       image: "00_winset_tabbar_press_right.png" COMP;
+                       image: "00_winset_toolbar_press.png" COMP;
+                       image: "00_winset_tabbar_focus.png" COMP;
+                       image: "00_winset_tabbar_focus_left.png" COMP;
+                       image: "00_winset_tabbar_focus_right.png" COMP;
+               }
+
+               parts{
+                       part{
+                               name: "bg_rect";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events: 1;
+                               description{
+                                       state: "default" 0.0;
+                                       min: 0 0;
+                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
+                                       color: 0 0 0 0;
+                               }
+                       }
+                       part{
+                               name: "bg_img";
+                               type: IMAGE;
+                               scale: 1;
+                               mouse_events: 0;
+                               description{
+                                       state: "default" 0.0;
+                                       visible: 0;
+                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
+                               }
+                               description{
+                                       state: "pressed" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_tabbar_press.png";
+                                       image.border: 2 2 3 2;
+                                       color: 255 255 255 50;
+                                       visible: 1;
+                               }
+                               description{
+                                       state: "pressed_left" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_tabbar_press_left.png";
+                                       image.border: 2 3 2 2;
+                                       color: 255 255 255 50;
+                                       visible: 1;
+                               }
+                               description{
+                                       state: "pressed_right" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_tabbar_press_right.png";
+                                       image.border: 3 2 2 2;
+                                       color: 255 255 255 50;
+                                       visible: 1;
+                               }
+                               description{
+                                       state: "focused" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 3 2;
+                                       visible: 1;
+                               }
+                               description{
+                                       state: "focused_left" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_tabbar_focus_left.png";
+                                       image.border: 2 3 2 2;
+                                       visible: 1;
+                               }
+                               description{
+                                       state: "focused_right" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_tabbar_focus_right.png";
+                                       image.border: 3 2 2 2;
+                                       visible: 1;
+                               }
+                               description{
+                                       state: "toolbar_pressed" 0.0;
+                                       inherit: "default" 0.0;
+                                       rel1 {relative: 0.0 0.07; offset: 3 0;}
+                                       rel2 {relative: 1.0 0.93; offset: -3 0;}
+                                       image.normal: "00_winset_toolbar_press.png";
+                                       image.border: 3 3 3 3;
+                                       visible: 1;
+                               }
+                       }
+                       part{
+                               name: "left_line";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description{
+                                       state: "default" 0.0;
+                                       visible: 0;
+                                       rel1 {relative: 0.0 0.0; offset: 0 5;}
+                                       rel2 {relative: 0.0 1.0; offset: 1 -3;}
+                                       color: CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC;
+                               }
+                               description{
+                                       state: "show" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                               }
+                       }
+                       part{
+                               name: "right_line";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description{
+                                       state: "default" 0.0;
+                                       visible: 0;
+                                       rel1 {relative: 1.0 0.0; offset: -1 5;}
+                                       rel2 {relative: 1.0 1.0; offset: 0 -3;}
+                                       color: CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC;
+                               }
+                               description{
+                                       state: "show" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                               }
+                       }
+                       part{
+                               name: "top_line";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description{
+                                       state: "default" 0.0;
+                                       visible: 0;
+                                       rel1 {relative: 0.0 0.0; offset: 5 0;}
+                                       rel2 {relative: 1.0 0.0; offset: -5 1;}
+                                       color: CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC;
+                               }
+                               description{
+                                       state: "show" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                               }
+                       }
+                       part{
+                               name: "bottom_line";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description{
+                                       state: "default" 0.0;
+                                       visible: 0;
+                                       rel1 {relative: 0.0 1.0; offset: 5 -1;}
+                                       rel2 {relative: 1.0 1.0; offset: -5 0;}
+                                       color: CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC;
+                               }
+                               description{
+                                       state: "show" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                               }
+                       }
+                       part{
+                               name: "item";
+                               type: SWALLOW;
+                               scale: 1;
+                               mouse_events: 1;
+                               description{
+                                       state: "default" 0.0;
+                                       rel1 {to: "bg_rect"; offset: 5 0;}
+                                       rel2 {to: "bg_rect"; offset: -6 0;}
+                               }
+                       }
+               }
+               programs {
+                       program {
+                               name: "selected";
+                               signal: "elm,state,selected";
+                               source: "elm";
+                               action: STATE_SET "focused" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "selected_left";
+                               signal: "elm,state,selected_left";
+                               source: "elm";
+                               action: STATE_SET "focused_left" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "selected_right";
+                               signal: "elm,state,selected_right";
+                               source: "elm";
+                               action: STATE_SET "focused_right" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "pressed";
+                               signal: "elm,state,pressed";
+                               source: "elm";
+                               action: STATE_SET "pressed" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "pressed_left";
+                               signal: "elm,state,pressed_left";
+                               source: "elm";
+                               action: STATE_SET "pressed_left" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "pressed_right";
+                               signal: "elm,state,pressed_right";
+                               source: "elm";
+                               action: STATE_SET "pressed_right" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "toolbar_pressed";
+                               signal: "elm,state,toolbar_pressed";
+                               source: "elm";
+                               action: STATE_SET "toolbar_pressed" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "unselected";
+                               signal: "elm,state,unselected";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "unpressed";
+                               signal: "elm,state,unpressed";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "bg_img";
+                       }
+                       program {
+                               name: "left_line_show";
+                               signal: "elm,state,left_line_show";
+                               source: "elm";
+                               action: STATE_SET "show" 0.0;
+                               target: "left_line";
+                       }
+                       program {
+                               name: "left_line_hide";
+                               signal: "elm,state,left_line_hide";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "left_line";
+                       }
+                       program {
+                               name: "right_line_show";
+                               signal: "elm,state,right_line_show";
+                               source: "elm";
+                               action: STATE_SET "show" 0.0;
+                               target: "right_line";
+                       }
+                       program {
+                               name: "right_line_hide";
+                               signal: "elm,state,right_line_hide";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "right_line";
+                       }
+                       program {
+                               name: "top_line_show";
+                               signal: "elm,state,top_line_show";
+                               source: "elm";
+                               action: STATE_SET "show" 0.0;
+                               target: "top_line";
+                       }
+                       program {
+                               name: "top_line_hide";
+                               signal: "elm,state,top_line_hide";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "top_line";
+                       }
+                       program {
+                               name: "bottom_line_show";
+                               signal: "elm,state,bottom_line_show";
+                               source: "elm";
+                               action: STATE_SET "show" 0.0;
+                               target: "bottom_line";
+                       }
+                       program {
+                               name: "bottom_line_hide";
+                               signal: "elm,state,bottom_line_hide";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "bottom_line";
+                       }
+               }
+       }
+

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 0359ec3..e6e1499 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -153,6 +153,7 @@
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_OH_PADDING_INC;
                rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -1042,6 +1043,7 @@
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_OH_PADDING_INC;
                rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader2"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader2"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -2649,6 +2651,7 @@
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_OH_PADDING_INC;
                rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -3468,6 +3471,7 @@
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_OH_PADDING_INC;
                rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader2"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader2"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;