nikawhite pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=164a4c85952bb30e47ef4a27db254d2141f4fc03
commit 164a4c85952bb30e47ef4a27db254d2141f4fc03 Author: Mykyta Biliavskyi <[email protected]> Date: Wed Jul 27 19:56:24 2016 +0300 Tizen theme: fix styles for managers properies. --- data/themes/tizen/color_classes.edc | 7 ++- data/themes/tizen/widgets/layouts/manager.edc | 63 +++++++++++++++++++++++++++ data/themes/tizen/widgets/panes.edc | 6 +-- src/bin/ui/property/property.c | 23 ++++++++-- 4 files changed, 89 insertions(+), 10 deletions(-) diff --git a/data/themes/tizen/color_classes.edc b/data/themes/tizen/color_classes.edc index 38fff8e..872f70d 100644 --- a/data/themes/tizen/color_classes.edc +++ b/data/themes/tizen/color_classes.edc @@ -221,4 +221,9 @@ color_classes { color2: 0 0 0 0; color3: 0 0 0 0; } -} + color_class { name: "manager_bg"; + color: 248 248 248 255; + color2: 0 0 0 0; + color3: 0 0 0 0; + } + } diff --git a/data/themes/tizen/widgets/layouts/manager.edc b/data/themes/tizen/widgets/layouts/manager.edc index 1db0d0b..4e78c59 100644 --- a/data/themes/tizen/widgets/layouts/manager.edc +++ b/data/themes/tizen/widgets/layouts/manager.edc @@ -228,3 +228,66 @@ group { name: "elm/layout/manager/preview"; } } } +group { name: "elm/layout/manager/property"; + parts { + part { name: "elm.text"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + fixed: 0 1; + max: -1 13; + color_class: "genlist_text_tree"; + text { + font: "Breeze"; + size: 13; + max: 1 0; + } + rel1.to_x: "border"; + rel2.to_x: "border"; + } + } + part { name: "border"; + type: RECT; + description { state: "default" 0.0; + align: 0.5 0.0; + min: 355 480; + max: 355 -1; + color_class: "manager_content_border"; + rel1 { + relative: 0.0 1.0; + offset: 0 8; + to_y: "elm.text"; + } + } + } + part { name: "bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + fixed: 1 1; + rel1 { + offset: 1 1; + to: "border"; + } + rel2 { + offset: -2 -2; + to: "border"; + } + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + fixed: 1 1; + min: 0 171; + rel1.to: "bg"; + rel2.to: "bg"; + } + } + } +} + diff --git a/data/themes/tizen/widgets/panes.edc b/data/themes/tizen/widgets/panes.edc index b622123..782ea59 100644 --- a/data/themes/tizen/widgets/panes.edc +++ b/data/themes/tizen/widgets/panes.edc @@ -292,7 +292,7 @@ group { name: "elm/panes/vertical/manager"; description { state: "default" 0.0; min: 15 0; max: 15 -1; - color: 244 244 244 255; + color_class: "manager_bg"; rel1 { to: "bar"; } @@ -302,13 +302,9 @@ group { name: "elm/panes/vertical/manager"; } description { state: "focused" 0.0; inherit: "default" 0.00; - color: 191 193 196 255; - rel1.offset: 0 0; - rel2.offset: -1 -1; } description { state: "clicked" 0.0; inherit: "focused" 0.00; - color: 185 187 190 255; } } part { name: "events"; diff --git a/src/bin/ui/property/property.c b/src/bin/ui/property/property.c index 0fe6707..3330ac5 100644 --- a/src/bin/ui/property/property.c +++ b/src/bin/ui/property/property.c @@ -181,11 +181,26 @@ property_add(Evas_Object *parent, Property_Mode mode) property_common_itc_init(pd); pd->layout = elm_layout_add(parent); - elm_layout_theme_set(pd->layout, "layout", "navigator", "default"); -#ifdef HAVE_TIZEN +#if HAVE_TIZEN Evas_Object *icon; - IMAGE_ADD_NEW(pd->layout, icon, "navigator", "property"); - elm_object_part_content_set(pd->layout, "elm.swallow.icon", icon); + switch (mode) + { + case PROPERTY_MODE_NONE: + case PROPERTY_MODE_DEMO: + case PROPERTY_MODE_GROUP: + elm_layout_theme_set(pd->layout, "layout", "navigator", "default"); + IMAGE_ADD_NEW(pd->layout, icon, "navigator", "property"); + elm_object_part_content_set(pd->layout, "elm.swallow.icon", icon); + break; + case PROPERTY_MODE_STYLE: + case PROPERTY_MODE_COLOR_CLASS: + case PROPERTY_MODE_IMAGE: + case PROPERTY_MODE_SOUND: + elm_layout_theme_set(pd->layout, "layout", "manager", "property"); + break; + } +#else + elm_layout_theme_set(pd->layout, "layout", "navigator", "default"); #endif elm_object_text_set(pd->layout, "Property"); --
