Merge "[Corrected Indentation and code cleanup in button.edc for popup button,circle...

diff --git a/debian/changelog b/debian/changelog
index 8503b4b..57c09d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nbeat-theme (0.1.1-106) unstable; urgency=low
+
+  * Package Upload.
+  * Git: 165.213.180.234:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-106
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Tue, 11 Oct 2011 21:18:22 +0900
+
 nbeat-theme (0.1.1-105) unstable; urgency=low
 
   * Package Upload

diff --git a/themes/groups/ctxpopup.edc b/themes/groups/ctxpopup.edc
index 429cc1e..1bca3c8 100644 (file)
--- a/themes/groups/ctxpopup.edc
+++ b/themes/groups/ctxpopup.edc
@@ -1097,6 +1097,14 @@
                                        }
                                }
                                description {
+                                       state: "compress" 0.0;
+                                       inherit: "default" 0.0;
+                                       max: -1 -1;
+                                       text {
+                                               min: 0 1;
+                                       }
+                               }
+                               description {
                                        state: "clicked" 0.0;
                                        inherit: "default" 0.0;
                                        color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
@@ -1113,7 +1121,7 @@
                                        max: 30 CTXPOPUP_ITEM_HEIGHT_INC;
                                        fixed: 1 0;
                                        align: 1.0 0.5;
-                       }
+                               }
                        }
                        part {
                                name: "over1";
@@ -1176,6 +1184,13 @@
                                }
                        }
                        program {
+                               name: "compress";
+                               signal: "elm,state,compress";
+                               source: "elm";
+                               action: STATE_SET "compress" 0.0;
+                               target: "elm.text";
+                       }
+                       program {
                                name: "vertical";
                                signal: "elm,state,vertical";
                                source: "elm";
@@ -1205,7 +1220,7 @@
                                signal: "mouse,up,1";
                                source: "over2";
                                script {
-                                       set_state(PART:"elm.text", "default", 0.0);
+                                       set_state(PART:"elm.text", "compress", 0.0);
                                        set_state(PART:"bg", "default", 0.0);
                                }
                        }
@@ -1225,6 +1240,7 @@
                        }
                        part {
                                name: "bg";
+                               scale: 1;
                                mouse_events: 0;
                                type: RECT;
                                description {
@@ -1289,7 +1305,7 @@
                                        state: "default" 0.0;
                                        min: (CTXPOPUP_ICON_WIDTH_INC - 10) (CTXPOPUP_ICON_HEIGHT_INC - 10);
                                        max: (CTXPOPUP_ICON_WIDTH_INC - 10) (CTXPOPUP_ICON_HEIGHT_INC - 10);
-                                       align: 0 0;
+                                       align: 0.5 0.5;
                                        aspect: 1.0 1.0;
                                        rel1 { to: "left_top_padding"; relative: 1 1; }
                                        rel2 { to: "right_bottom_padding"; relative: 0 0; }
@@ -1518,6 +1534,14 @@
                                        }
                                }
                                description {
+                                       state: "compress" 0.0;
+                                       inherit: "default" 0.0;
+                                       max: -1 -1;
+                                       text {
+                                               min: 0 1;
+                                       }
+                               }
+                               description {
                                        state: "clicked" 0.0;
                                        inherit: "default" 0.0;
                                        color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
@@ -1598,6 +1622,13 @@
                                }
                        }
                        program {
+                               name: "compress";
+                               signal: "elm,state,compress";
+                               source: "elm";
+                               action: STATE_SET "compress" 0.0;
+                               target: "elm.text";
+                       }
+                       program {
                                name: "vertical";
                                signal: "elm,state,vertical";
                                source: "elm";
@@ -1627,7 +1658,7 @@
                                signal: "mouse,up,1";
                                source: "over2";
                                script {
-                                       set_state(PART:"elm.text", "default", 0.0);
+                                       set_state(PART:"elm.text", "compress", 0.0);
                                        set_state(PART:"bg", "default", 0.0);
                                }
                        }

diff --git a/themes/groups/editfield.edc b/themes/groups/editfield.edc
index 38b3b21..ef0cd98 100644 (file)
--- a/themes/groups/editfield.edc
+++ b/themes/groups/editfield.edc
@@ -47,7 +47,7 @@ group { name: "elm/editfield/base/default";
          tag:  "hilight" "+ font=SLP:style=Bold";
       }
       style { name: "editfield_content_password_style";
-         base: "font=SLP:style=Roman font_size=24 color="ENTRY_TEXT_COLOR_INC" wrap=none ellipsis=1";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none ellipsis=1";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1306,7 +1306,7 @@ group { name: "elm/editfield/base/font_color_black";
          tag:  "hilight" "+ font=SLP:style=Bold";
       }
       style { name: "editfield_content_password_black_style";
-         base: "font=SLP:style=Roman font_size=24 color=#000000FF wrap=none ellipsis=1";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none ellipsis=1";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";

diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_styles.edc
index ffead86..787ea2b 100644 (file)
--- a/themes/groups/genlist/genlist_styles.edc
+++ b/themes/groups/genlist/genlist_styles.edc
@@ -20956,5 +20956,286 @@
             target: "disclip";
          }
       }
+  }
+
+   group { name: "elm/genlist/item/3text.3icon/default";
+      alias: "elm/genlist/item_odd/3text.3icon/default";
+      alias: "elm/genlist/item_compress/3text.3icon/default";
+      alias: "elm/genlist/item_compress_odd/3text.3icon/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "icons" "elm.icon.1 elm.icon.2 elm.swallow.progress";
+      data.item: "renames" "elm.edit.rename";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         GENLIST_PART_BASE( GENLIST_HEIGHT_81_INC )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_6_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_6_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_10_INC )
+         part { name: "elm.icon.1";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_SIZE_40_INC GENLIST_SIZE_40_INC;
+               max: GENLIST_SIZE_40_INC GENLIST_SIZE_40_INC;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_RENAME_ENABLED
+         }
+         part { name: "elm.padding.icon1.right";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_10_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
+               }
+               rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1.0 0.5;
+            }
+            GENLIST_DESCRIPTION_RENAME_ENABLED
+         }
+         part { name: "elm.padding.icon2.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_10_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon.2";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.2";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_38_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.top";
+               }
+               align: 0 0;
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_28_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_RENAME_ENABLED
+         }
+         part { name: "elm.swallow.progress";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.text.2";
+               }
+               align: 0.5 0.5;
+            }
+            GENLIST_DESCRIPTION_RENAME_ENABLED
+         }
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_30_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.bottom";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0 1;
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_20_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_RENAME_ENABLED
+         }
+                part { name: "elm.text.3";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_30_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.bottom";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1 1;
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_20_INC;
+                  min: 0 1;
+                  align: 1.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_RENAME_ENABLED
+         }
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.text.3";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.text.3";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program { name: "rename_enabled";
+            signal: "elm,state,rename,enabled";
+            source: "elm";
+            action: STATE_SET "rename_enabled" 0.0;
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.text.3";
+            target: "elm.icon.1";
+            target: "elm.icon.2";
+            target: "elm.swallow.progress";
+            target: "elm.edit.rename";
+         }
+         program { name: "rename_disabled";
+            signal: "elm,state,rename,disabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.text.3";
+            target: "elm.icon.1";
+            target: "elm.icon.2";
+            target: "elm.swallow.progress";
+            target: "elm.edit.rename";
+         }
+      }
    }
+
 ////////////////////////////////////////////////////////

diff --git a/themes/groups/layout.edc b/themes/groups/layout.edc
index c344f43..1638d98 100644 (file)
--- a/themes/groups/layout.edc
+++ b/themes/groups/layout.edc
@@ -34,7 +34,7 @@
          part { name: "indicator";
             type: RECT;
             scale: 1;
-            description { state: "default" 0.0;  
+            description { state: "default" 0.0;
                min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
                max: 999999 LAYOUT_INDICATOR_HEIGHT_INC;
                fixed: 0 1;
@@ -104,6 +104,31 @@
       }
    }
    /*************************************************/
+   /* elm_layout -> no indicator template style     */
+   /*************************************************/
+   group { name: "elm/layout/application/noindicator";
+      parts {
+         part { name: "elm.swallow.bg";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+            }
+         }
+      }
+   }
+   /*************************************************/
    /* elm_layout -> searchbar style                 */
    /*************************************************/
    group { name: "elm/layout/searchbar/default";

diff --git a/themes/groups/multibuttonentry.edc b/themes/groups/multibuttonentry.edc
index 3ce9de9..8ceca59 100644 (file)
--- a/themes/groups/multibuttonentry.edc
+++ b/themes/groups/multibuttonentry.edc
@@ -332,6 +332,7 @@
          image: "00_mbe_btn_circle_bg_press.png" COMP;
          image: "00_mbe_btn_expand_closed.png" COMP;
          image: "00_mbe_btn_expand_closed_press.png" COMP;
+         image: "00_mbe_btn_expand_opened.png" COMP;
       }
       data.item: "closed_button_height" MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
       data.item: "closed_button_width" MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
@@ -356,6 +357,11 @@
                inherit: "default" 0.0;
                image.normal: "00_mbe_btn_circle_bg_press.png";
             }
+            description {
+               state: "closed" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_mbe_btn_circle_bg_normal.png";
+            }
          }
          part {
             name: "closed_button";
@@ -367,7 +373,7 @@
                align: 0.5 0.5;
                min: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
                visible: 1;
-               image.normal: "00_mbe_btn_expand_closed.png";
+               image.normal: "00_mbe_btn_expand_opened.png";
                rel1 { relative: 0.0 0.0; }
                rel2 { relative: 1.0 1.0; }
             }
@@ -376,6 +382,11 @@
                inherit: "default" 0.0;
                image.normal: "00_mbe_btn_expand_closed_press.png";
             }
+            description {
+               state: "closed" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_mbe_btn_expand_closed.png";
+            }
          }
       }
 
@@ -396,6 +407,13 @@
             target: "closed_button_bg";
             target: "closed_button";
          }
+         program {
+            name: "closed";
+            signal: "closed";
+            action: STATE_SET "closed" 0.0;
+            target: "closed_button_bg";
+            target: "closed_button";
+         }
       }
    }
 

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 1ff5dd6..3bf7419 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -100,7 +100,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.top.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -130,7 +130,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.bottom.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -280,8 +280,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                max: NAVIFRAME_ICON_SIZE_INC;
-               rel1 { relative: 0.0 0.0; to_x: "padding_before_text"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_before_text"; }
+               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
+               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 1.0 0.5;
@@ -294,8 +294,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; }
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -585,7 +585,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.top.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -615,7 +615,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.mid.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -645,7 +645,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.bottom.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -795,8 +795,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                max: NAVIFRAME_ICON_SIZE_INC;
-               rel1 { relative: 0.0 0.0; to_x: "padding_before_text"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_before_text"; }
+               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
+               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 1.0 0.5;
@@ -809,8 +809,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; }
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -1102,7 +1102,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.top.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -1132,7 +1132,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.bottom.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -1272,8 +1272,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                max: NAVIFRAME_ICON_SIZE_INC;
-               rel1 { relative: 0.0 0.0; to_x: "padding_before_text"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_before_text"; }
+               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
+               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 1.0 0.5;
@@ -1286,8 +1286,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; }
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -1539,7 +1539,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.top.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -1570,7 +1570,7 @@
          }
 
          part { name: "elm.swallow.optionheader.mid.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -1600,7 +1600,7 @@
             }
          }
          part { name: "elm.swallow.optionheader.bottom.padding";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
@@ -1740,8 +1740,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                max: NAVIFRAME_ICON_SIZE_INC;
-               rel1 { relative: 0.0 0.0; to_x: "padding_before_text"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_before_text"; }
+               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
+               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 1.0 0.5;
@@ -1754,8 +1754,8 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; }
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;

diff --git a/themes/images/nbeat-black-hd/00_mbe_btn_expand_opened.png b/themes/images/nbeat-black-hd/00_mbe_btn_expand_opened.png
new file mode 100755 (executable)
index 0000000..9d89e65
Binary files /dev/null and b/themes/images/nbeat-black-hd/00_mbe_btn_expand_opened.png differ

diff --git a/themes/images/nbeat-black-hd/navibar_item_separator.png b/themes/images/nbeat-black-hd/navibar_item_separator.png
index 5e06ea0..e90f19c 100644 (file)
Binary files a/themes/images/nbeat-black-hd/navibar_item_separator.png and b/themes/images/nbeat-black-hd/navibar_item_separator.png differ

diff --git a/themes/images/nbeat-black/00_mbe_btn_expand_opened.png b/themes/images/nbeat-black/00_mbe_btn_expand_opened.png
new file mode 100755 (executable)
index 0000000..6946bf7
Binary files /dev/null and b/themes/images/nbeat-black/00_mbe_btn_expand_opened.png differ

diff --git a/themes/images/nbeat-hd/00_mbe_btn_expand_opened.png b/themes/images/nbeat-hd/00_mbe_btn_expand_opened.png
new file mode 100755 (executable)
index 0000000..ca1208d
Binary files /dev/null and b/themes/images/nbeat-hd/00_mbe_btn_expand_opened.png differ

diff --git a/themes/images/nbeat/00_mbe_btn_expand_opened.png b/themes/images/nbeat/00_mbe_btn_expand_opened.png
new file mode 100755 (executable)
index 0000000..b821e01
Binary files /dev/null and b/themes/images/nbeat/00_mbe_btn_expand_opened.png differ