EFL Requests : font, style

Change-Id: I8dd9bc781953686831da8d57b8a1703ff2db03fb

diff --git a/data/edje/index.edc b/data/edje/index.edc
index 39863588a6e95a563d0890015f962fa99acbb114..e0fed76edf655e39b3e114e10c148644777c90c6 100644 (file)
--- a/data/edje/index.edc
+++ b/data/edje/index.edc
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
 
-#define INDEX_PAGECONTROL_IND_INC 35 35 
-#define INDEX_PAGECONTROL_IND_MIN_INC 35 35 
+#define INDEX_PAGECONTROL_IND_INC 35 35
+#define INDEX_PAGECONTROL_IND_MIN_INC 35 35
 #define INDEX_PAGECONTROL_FONT_COLOR_INC 255 255 255
-#define INDEX_PAGECONTROL_FONT_SIZE_INC 18 
+#define INDEX_PAGECONTROL_FONT_SIZE_INC 18
 
 collections {
    group {
@@ -140,7 +140,7 @@ collections {
                color: INDEX_PAGECONTROL_FONT_COLOR_INC 0;
                align: 0.5 0.5;
                text {
-                  font: "SLP:style=Bold";
+                  font: "TIZEN:style=Bold";
                   size: INDEX_PAGECONTROL_FONT_SIZE_INC;
                   min: 0 1;
                   //FIXME:values should be 0.5 0.5 when fonts are aligned correctly.

diff --git a/data/edje/item_4x4.edc b/data/edje/item_4x4.edc
index 03f1e056dd899792aa14339527063d1c273a7adf..2b890e7cc0e6d4d400c639d6612ed231df65ad08 100644 (file)
--- a/data/edje/item_4x4.edc
+++ b/data/edje/item_4x4.edc
@@ -19,7 +19,7 @@
 styles {
        style {
                name: "app_name_style";
-               base: "font=SLP:style=MEDIUM font_size=27 align=center valign=top color=#FFFFFF style=soft_shadow shadow_color=#00000060 ellipsis=1";
+               base: "font=TIZEN:style=MEDIUM font_size=27 align=center valign=top color=#FFFFFF style=soft_shadow shadow_color=#00000060 ellipsis=1";
 
                tag: "br" "\n";
        }
@@ -121,7 +121,7 @@ collections {
                                        text {
                                                //style: "app_name_style";
                                                text_class: "menu_item";
-                                               font: "SLP:style=medium";
+                                               font: "TIZEN:style=medium";
                                                size: 16;
                                                text: "Icon";
                                                align: 0.5 0.1;
@@ -136,7 +136,7 @@ collections {
                                }
                        }
                }
-               
+
                programs {
                        program {
                                name: "item,down";

diff --git a/src/item.c b/src/item.c
index 1d799f96d9108c0bcf0249451eea55e9b1231f39..aeb18120a1e308c287392edc21fd1f3a9d3c68e1 100644 (file)
--- a/src/item.c
+++ b/src/item.c
@@ -518,7 +518,7 @@ Evas_Object *item_create(Evas_Object *scroller, app_info_t* ai)
        evas_object_size_hint_max_set(bg, item_width, item_height);
        elm_object_part_content_set(item, "bg", bg);
 
-       edje_object_text_class_set(_EDJ(item), "menu_item", "SLP:style=medium", 24);
+       edje_object_text_class_set(_EDJ(item), "menu_item", "TIZEN:style=medium", 24);
 
        evas_object_data_set(item, "win", evas_object_data_get(scroller, "win"));
        evas_object_data_set(item, "layout", evas_object_data_get(scroller, "layout"));

diff --git a/src/menu_screen.c b/src/menu_screen.c
index acd66504c5a2f41da3f9539177310e39e1a74f6b..2b4d91b0f532654719a9cdaaa236150bfc8dc8c5 100644 (file)
--- a/src/menu_screen.c
+++ b/src/menu_screen.c
@@ -305,6 +305,7 @@ Evas_Object *_create_conformant(Evas_Object *win)
        conformant = elm_conformant_add(win);
        retv_if(NULL == conformant, NULL);
 
+       elm_object_style_set(conformant, "nokeypad");
        evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_data_set(conformant, "win", win);
        evas_object_show(conformant);