Fix Brightness Style in Display

- apply a custom layout

Change-Id: If9542b0e3ec47b4fe4d3c50987391e75e42b15d5
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

diff --git a/resource/setting-slider.edc b/resource/setting-slider.edc
index 60deb1ff7a0da329eaf05a98f721dc1934017804..23c0352ebfac734b94c5cba1b1e7fbfd3a3a6f0e 100644 (file)
--- a/resource/setting-slider.edc
+++ b/resource/setting-slider.edc
@@ -746,6 +746,97 @@ collections {
       }
    }
 
+       group { name: "gl_custom_item";
+          styles{
+                 style { name: "text_style";
+                        base: "color=#000000FF font=Tizen:style=Regular font_size=30 text_class=list_item ellipsis=1.0";
+                        tag:  "br" "\n";
+                        tag:  "ps" "ps";
+                        tag:  "tab" "\t";
+                        tag:  "b" "+ font_weight=Bold";
+                        tag:  "match" "+ color=#0051B5FF";
+                 }
+          }
+          parts {
+                 part { name: "base";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 0 120; //GENLIST_ITEM_1LINE_HEIGHT
+                        }
+                 }
+                 part { name: "left_padding";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 24 0;
+                               align: 0.0 0.0;
+                               rel1 { to: "base"; relative: 0.0 0.0; }
+                               rel2 { to: "base"; relative: 0.0 1.0; }
+                        }
+                 }
+                 part { name: "right_padding";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 24 0;
+                               align: 1.0 0.0;
+                               rel1 { to: "base"; relative: 1.0 0.0; }
+                               rel2 { to: "base"; relative: 1.0 1.0; }
+                        }
+                 }
+                 part { name: "top_padding";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 0 17;
+                               align: 0.0 0.0;
+                               rel1 { to_x: "left_padding"; to_y: "base"; relative: 1.0 0.0; }
+                               rel2 { to_x: "right_padding"; to_y: "base"; relative: 0.0 0.0; }
+                        }
+                 }
+                 part { name: "elm.text";
+                        type: SWALLOW;
+                        scale: 1;
+                        mouse_events: 0;
+                        description { state: "default" 0.0;
+                               min: 0 41;
+                               align: 0.0 0.0;
+                               rel1 { to: "top_padding"; relative: 0.0 1.0; }
+                               rel2 { to: "top_padding"; relative: 1.0 1.0; }
+                        }
+                 }
+                 part { name: "text_content_padding";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 0 10;
+                               align: 0.0 0.0;
+                               rel1 { to: "elm.text"; relative: 0.0 1.0; }
+                               rel2 { to: "elm.text"; relative: 1.0 1.0; }
+                        }
+                 }
+                 part { name: "elm.swallow.content";
+                        type: SWALLOW;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               align: 0.5 0.0;
+                               rel1 { to: "text_content_padding"; relative: 0.0 1.0; }
+                               rel2 { to: "bottom_padding"; relative: 1.0 0.0; }
+                        }
+                 }
+                 part { name: "bottom_padding";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 0 24;
+                               align: 0.5 1.0;
+                               rel1 { to: "base"; relative: 0.0 1.0; }
+                               rel2 { to: "base"; relative: 1.0 1.0; }
+                        }
+                 }
+          }
+       }
 }
 
 

diff --git a/setting-display/src/setting-display-brightness.c b/setting-display/src/setting-display-brightness.c
index bfdc1e1cbb2c3f9ad2cfdb8c2281471bdb8605bb..4e396a959f349e2ee8605d0286041b67243197ea 100644 (file)
--- a/setting-display/src/setting-display-brightness.c
+++ b/setting-display/src/setting-display-brightness.c
@@ -543,10 +543,44 @@ static Evas_Object *__setting_brightness_add_slider(void *data, Evas_Object *obj
        Eina_List *items = NULL;
 
        SETTING_TRACE_BEGIN;
+
+#if 1
+       SETTING_TRACE(" ------------> slider content get [%s]",part);
+#endif
        setting_retvm_if(!data || !obj, NULL, "!data || !obj");
        retv_if(!data, NULL);
 
-       if (!safeStrCmp(part, "elm.icon")) {
+       if (!safeStrCmp(part, "elm.swallow.content")) {
+
+               Evas_Object *layout, *label;
+
+               // Set custom layout style
+               layout = elm_layout_add(obj);
+               elm_layout_file_set(layout, SETTING_SLIDER_EDJ_NAME, "gl_custom_item");
+               evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+               // Set text into layout
+               label = elm_label_add(obj);
+               evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 0);
+               evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               elm_object_text_set(label, _("IDS_ST_BODY_BRIGHTNESS_M_POWER_SAVING"));
+               elm_object_part_content_set(layout, "elm.text", label);
+
+               //elm_atspi_accessible_relationship_append(id->item, ELM_ATSPI_RELATION_LABELLED_BY, label);
+               //elm_atspi_accessible_relationship_append(label, ELM_ATSPI_RELATION_CONTROLLED_BY, id->item);
+
+               // Set slider into layout
+#if 0
+               slider = elm_slider_add(obj);
+               elm_slider_indicator_show_set(slider, EINA_FALSE);
+               evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               elm_slider_horizontal_set(slider, EINA_TRUE);
+               elm_object_part_content_set(layout, "elm.swallow.content", slider);
+#endif
+
+               
                int auto_value = SETTING_BRIGHTNESS_AUTOMATIC_ON;
                int err, ret;
                Evas_Object *slider = elm_slider_add(obj);      /*  "elm/slider/horizontal/default" */
@@ -573,6 +607,7 @@ static Evas_Object *__setting_brightness_add_slider(void *data, Evas_Object *obj
                        elm_slider_step_set(slider, step);
                }
 
+
                elm_slider_min_max_set(slider, BRIGHTNESS_MIN, BRIGHTNESS_MAX);
                evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0);
                evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
@@ -605,8 +640,12 @@ static Evas_Object *__setting_brightness_add_slider(void *data, Evas_Object *obj
                        items = eina_list_append(items, slider);
                        elm_object_item_access_order_set(item_data->item, items);
                }
-
+#if 0
                return slider;
+#else
+               elm_object_part_content_set(layout, "elm.swallow.content", slider);
+               return layout;
+#endif
        }
 
        return NULL;
@@ -625,7 +664,8 @@ void construct_brightness(void *data, Evas_Object *genlist)
        SETTING_TRACE_BEGIN;
        ret_if(data == NULL);
 
-       setting_create_Gendial_itc("slider.main", &(ad->itc_1icon));
+       //setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(ad->itc_1icon));
+       setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_1icon));
 
        ad->itc_1icon.func.content_get = __setting_brightness_add_slider;
        ad->last_requested_level = -1;

diff --git a/setting-display/src/setting-display-main.c b/setting-display/src/setting-display-main.c
index afb0964921ebc4f5a508be6a424fc768d6911643..9c8c3426a7000270557244068e57edbc43f1de6a 100644 (file)
--- a/setting-display/src/setting-display-main.c
+++ b/setting-display/src/setting-display-main.c
@@ -26,6 +26,8 @@
 #include <bundle_internal.h>
 #include <system_settings.h>
 
+// elm_layout_file_set
+
 
 static int setting_display_main_create(void *cb);
 static int setting_display_main_destroy(void *cb);