[Merge conflict resolved]

[elc_naviframe]: Added option header1 and option header 2 options and
solved larger gap issue by controlling padding via naviframe.
Change-Id: Iaa23b2d1e68213a3903afc5d0348f550d19fcf05

diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc
index 49213b2..be57417 100644 (file)
--- a/themes/groups/controlbar.edc
+++ b/themes/groups/controlbar.edc
@@ -1534,8 +1534,8 @@
                                mouse_events: 1;
                                description{
                                        state: "default" 0.0;
-                                       rel1 {to: "bg_rect"; offset: 5 10;}
-                                       rel2 {to: "bg_rect"; offset: -6 -10;}
+                                       rel1 {to: "bg_rect"; offset: 5 0;}
+                                       rel2 {to: "bg_rect"; offset: -6 0;}
                                }
                        }
                }

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 7076483..8072c44 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -93,17 +93,29 @@
                }
             }
          }
+         part { name: "elm.swallow.optionheader.top.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 0.0; to: "optionheader_bg"; }
+               rel2 { relative: 1.0 0.0; to: "optionheader_bg"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.swallow.optionheader";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_H_INC;
-               rel1.to: "optionheader_bg";
-               rel2.to: "optionheader_bg";
-               rel2.relative: 1 0;
+               min: 1 NAVIFRAME_OH_CONTENT_H_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
                fixed: 0 1;
-               align: 0.5 0;
+               align: 0.0 0.0;
                visible: 0;
             }
             description { state: "show" 0.0;
@@ -111,6 +123,18 @@
                visible: 1;
             }
          }
+         part { name: "elm.swallow.optionheader.bottom.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "content_clip";
             type: RECT;
             mouse_events: 0;
@@ -507,17 +531,29 @@
                }
             }
          }
+         part { name: "elm.swallow.optionheader.top.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 0.0; to: "optionheader_bg"; }
+               rel2 { relative: 1.0 0.0; to: "optionheader_bg"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.swallow.optionheader";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC;
-               rel1.to: "optionheader_bg";
-               rel2.to: "optionheader_bg";
-               rel2.relative: 1 0;
+               min: 1 NAVIFRAME_OH_CONTENT_H_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
                fixed: 0 1;
-               align: 0.5 0;
+               align: 0.0 0.0;
                visible: 0;
             }
             description { state: "show" 0.0;
@@ -525,6 +561,48 @@
                visible: 1;
             }
          }
+         part { name: "elm.swallow.optionheader.mid.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            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;
+            }
+         }
+         part { name: "elm.swallow.optionheader2";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_CONTENT_H_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.mid.padding";}
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.mid.padding";}
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.optionheader.bottom.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader2"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "content_clip";
             type: RECT;
             mouse_events: 0;
@@ -770,6 +848,7 @@
                set_state(PART:"optionheader_clip", "show", 0.0);
                set_state(PART:"optionheader_arrow", "show", 0.0);
                set_state(PART:"elm.swallow.optionheader", "show", 0.0);
+               set_state(PART:"elm.swallow.optionheader2", "show", 0.0);
                set_int(oh_show, 1);
                emit("elm,state,optionheader_arrow,show", "");
             }
@@ -781,6 +860,7 @@
                set_state(PART:"optionheader_clip", "default", 0.0);
                set_state(PART:"optionheader_arrow", "default", 0.0);
                set_state(PART:"elm.swallow.optionheader", "default", 0.0);
+               set_state(PART:"elm.swallow.optionheader2", "default", 0.0);
                set_int(oh_show, 0);
             }
          }
@@ -790,6 +870,7 @@
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
             target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
             transition: LINEAR 0.2;
             after: "optionheader_open_set";
          }
@@ -799,6 +880,7 @@
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
             target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
             transition: LINEAR 0.2;
             after: "optionheader_close_set";
          }
@@ -808,6 +890,7 @@
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
             target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
             after: "optionheader_open_set";
          }
          program { name: "optionheader_instant_close";
@@ -816,6 +899,7 @@
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
             target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
             after: "optionheader_close_set";
          }
          program { name: "optionheader_close_set";
@@ -917,17 +1001,29 @@
                }
             }
          }
+         part { name: "elm.swallow.optionheader.top.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 0.0; to: "optionheader_bg"; }
+               rel2 { relative: 1.0 0.0; to: "optionheader_bg"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.swallow.optionheader";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_H_INC;
-               rel1.to: "optionheader_bg";
-               rel2.to: "optionheader_bg";
-               rel2.relative: 1 0;
+               min: 1 NAVIFRAME_OH_CONTENT_H_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
                fixed: 0 1;
-               align: 0.5 0;
+               align: 0.0 0.0;
                visible: 0;
             }
             description { state: "show" 0.0;
@@ -935,6 +1031,18 @@
                visible: 1;
             }
          }
+         part { name: "elm.swallow.optionheader.bottom.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "content_clip";
             type: RECT;
             mouse_events: 0;
@@ -1259,6 +1367,7 @@
          }
       }
    }
+
    group { name:"elm/naviframe/item/instant2/default";
       images {
          image: "naviframe_optionheader.png" COMP;
@@ -1315,17 +1424,29 @@
                }
             }
          }
+         part { name: "elm.swallow.optionheader.top.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 0.0; to: "optionheader_bg"; }
+               rel2 { relative: 1.0 0.0; to: "optionheader_bg"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.swallow.optionheader";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC;
-               rel1.to: "optionheader_bg";
-               rel2.to: "optionheader_bg";
-               rel2.relative: 1 0;
+               min: 1 NAVIFRAME_OH_CONTENT_H_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
                fixed: 0 1;
-               align: 0.5 0;
+               align: 0.0 0.0;
                visible: 0;
             }
             description { state: "show" 0.0;
@@ -1333,6 +1454,49 @@
                visible: 1;
             }
          }
+
+         part { name: "elm.swallow.optionheader.mid.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            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;
+            }
+         }
+         part { name: "elm.swallow.optionheader2";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_CONTENT_H_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.mid.padding";}
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.mid.padding";}
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.optionheader.bottom.padding";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader2"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "content_clip";
             type: RECT;
             mouse_events: 0;
@@ -1566,6 +1730,7 @@
                set_state(PART:"optionheader_clip", "show", 0.0);
                set_state(PART:"optionheader_arrow", "show", 0.0);
                set_state(PART:"elm.swallow.optionheader", "show", 0.0);
+               set_state(PART:"elm.swallow.optionheader2", "show", 0.0);
                set_int(oh_show, 1);
                emit("elm,state,optionheader_arrow,show", "");
             }
@@ -1577,6 +1742,7 @@
                set_state(PART:"optionheader_clip", "default", 0.0);
                set_state(PART:"optionheader_arrow", "default", 0.0);
                set_state(PART:"elm.swallow.optionheader", "default", 0.0);
+               set_state(PART:"elm.swallow.optionheader2", "default", 0.0);
                set_int(oh_show, 0);
             }
          }
@@ -1586,6 +1752,7 @@
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
             target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
             transition: LINEAR 0.2;
             after: "optionheader_open_set";
          }
@@ -1595,6 +1762,7 @@
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
             target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
             transition: LINEAR 0.2;
             after: "optionheader_close_set";
          }
@@ -1604,6 +1772,7 @@
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
             target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
             after: "optionheader_open_set";
          }
          program { name: "optionheader_instant_close";
@@ -1612,6 +1781,7 @@
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
             target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
             after: "optionheader_close_set";
          }
          program { name: "optionheader_close_set";

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index bb83d15..868637d 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -33,6 +33,8 @@
 #define NAVIFRAME_TITLE_H_INC 90
 #define NAVIFRAME_OH_CLOSED_H_INC 8
 #define NAVIFRAME_OH_OPENED_H_INC 106
+#define NAVIFRAME_OH_CONTENT_H_INC 74
+#define NAVIFRAME_OH_PADDING_INC 16
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
 #define NAVIFRAME_OH_SHADOW_H_INC 0
 #define NAVIFRAME_INDICATOR_W_INC 128

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 1d98e6e..809e2f2 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -33,7 +33,9 @@
 #define NAVIFRAME_TITLE_H_INC 50
 #define NAVIFRAME_OH_CLOSED_H_INC 5
 #define NAVIFRAME_OH_OPENED_H_INC 65
-#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 124
+#define NAVIFRAME_OH_CONTENT_H_INC 45
+#define NAVIFRAME_OH_PADDING_INC 10
+#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 120
 #define NAVIFRAME_INDICATOR_W_INC 80
 #define NAVIFRAME_PADDING_EXPANDED_INC 102
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 22

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index e0110c5..ade468c 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -33,6 +33,8 @@
 #define NAVIFRAME_TITLE_H_INC 90
 #define NAVIFRAME_OH_CLOSED_H_INC 8
 #define NAVIFRAME_OH_OPENED_H_INC 106
+#define NAVIFRAME_OH_CONTENT_H_INC 74
+#define NAVIFRAME_OH_PADDING_INC 16
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
 #define NAVIFRAME_INDICATOR_W_INC 128
 #define NAVIFRAME_PADDING_EXPANDED_INC 141

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index ffc7f9a..2951aac 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -33,7 +33,9 @@
 #define NAVIFRAME_TITLE_H_INC 50
 #define NAVIFRAME_OH_CLOSED_H_INC 5
 #define NAVIFRAME_OH_OPENED_H_INC 65
-#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 124
+#define NAVIFRAME_OH_CONTENT_H_INC 45
+#define NAVIFRAME_OH_PADDING_INC 10
+#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 120
 #define NAVIFRAME_INDICATOR_W_INC 80
 #define NAVIFRAME_PADDING_EXPANDED_INC 102
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 22