[Fix] Issue SAD-705 Display->brightness font translation_fix
authorRadek Kintop <r.kintop@samsung.com>
Fri, 18 Oct 2019 13:43:32 +0000 (15:43 +0200)
committerKrzysztof Wieclaw <k.wieclaw@samsung.com>
Fri, 18 Oct 2019 13:57:00 +0000 (15:57 +0200)
resource/setting-theme.edc
setting-display/src/setting-display-brightness.c

index 2eff1ad425386014903bcd614ecc533ff886ddb8..753b10c5d008fb81042edcd428f20ef70ac94199 100644 (file)
@@ -1898,6 +1898,136 @@ collections
                }
        }
 
+       group
+       {       name: "gl_custom_item_display_brightness";
+               styles
+               {
+                       style
+                       {       name: "text_style_display_brightness";
+                               base: "color=#000000FF font=BreezeSans:style=Light font_weight=normal font_size=54 ellipsis=1.0";
+                               tag: "br" "\n";
+                               tag: "ps" "ps";
+                               tag: "tab" "\t";
+                               tag:  "b" "+ font_weight=Bold";
+                       }
+               }
+               parts
+               {
+                       part
+                       {       name: "base";
+                               type: SPACER;
+                               scale: 1;
+                               description
+                               {       state: "default" 0.0;
+                               }
+                       }
+                       part
+                       {       name: "left_padding";
+                               type: SPACER;
+                               scale: 1;
+                               description
+                               {       state: "default" 0.0;
+                                       min: 32 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: 32 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 24;
+                                       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: TEXTBLOCK;
+                               scale: 1;
+                               mouse_events: 0;
+                               description
+                               {       state: "default" 0.0;
+                                       align: 0.0 0.0;
+                                       rel1
+                                       {       to: "top_padding"; relative: 0.0 1.0;}
+                                       rel2
+                                       {       to: "top_padding"; relative: 1.0 1.0;}
+                                       text.style: "text_style_display_brightness";
+                                       text.min: 0 1;
+                               }
+                       }
+                       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_y: "bottom_padding";
+                                               to_x: "right_padding";
+                                               relative: 0.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;}
+                               }
+                       }
+               }
+       }
+
+
        group
        {       name: "gl_custom_item_icon";
                styles
index ad32260765caed681abb2b41a69dc7e4088cbbec..e907209042b678e0e9df0bf4b5c79712b60d871b 100755 (executable)
@@ -600,7 +600,7 @@ static Evas_Object *__setting_brightness_add_slider(void *data,
        /* Set custom layout style */
        layout = elm_layout_add(obj);
        elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME,
-                       "gl_custom_item");
+                       "gl_custom_item_display_brightness");
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL,
                        EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,