hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=df3d1f9e4db990625a852d40a86b8e01b8cde90a
commit df3d1f9e4db990625a852d40a86b8e01b8cde90a
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Feb 6 03:04:22 2016 +0900
status: improve button style.
---
data/themes/default/images/expand.png | Bin 202 -> 345 bytes
data/themes/default/images/invert.png | Bin 262 -> 488 bytes
data/themes/default/layout_common.edc | 60 ++++++----------------------------
data/themes/default/theme_ext.edc | 1 -
src/bin/statusbar.c | 3 +-
5 files changed, 12 insertions(+), 52 deletions(-)
diff --git a/data/themes/default/images/expand.png
b/data/themes/default/images/expand.png
index dd8e15f..b5335f3 100644
Binary files a/data/themes/default/images/expand.png and
b/data/themes/default/images/expand.png differ
diff --git a/data/themes/default/images/invert.png
b/data/themes/default/images/invert.png
index a55d07d..2fd2a64 100644
Binary files a/data/themes/default/images/invert.png and
b/data/themes/default/images/invert.png differ
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 45f5d35..2908782 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -1789,8 +1789,9 @@ group { name: "statusbar_layout";
description { state: "default" 0.0;
rel1.relative: 0.0 0.0;
rel2.relative: 0.0 1.0;
+ rel1.offset: 3 -3;
align: 0.0 0.5;
- min: 18 18;
+ min: 15 15;
fixed: 1 0;
}
}
@@ -1824,6 +1825,7 @@ group { name: "statusbar_layout";
rel2.relative: 1 1;
rel1.to: "scale_spacer";
rel2.to: "scale_spacer";
+ rel1.offset: 5 0;
min: 120 0;
fixed: 1 0;
align: 0 0.5;
@@ -1834,32 +1836,12 @@ group { name: "statusbar_layout";
scale: 1;
desc {
rel1.to_x: "size_spacer";
- rel1.relative: 0.0 0.0;
- rel2.relative: 0.0 1.0;
- align: 0 0.5;
- fixed: 0 0;
- min: 18 18;
- }
- }
- text { "elm.text.size[";
- clip_to: "base_clip";
- scale: 1;
- effect: SHADOW BOTTOM;
- desc {
- rel1.to_x: "invert_btn";
- rel1.relative: 1.0 0.0;
- rel2.to_x: "invert_btn";
- rel2.relative: 0.0 1.0;
- align: 0 0.5;
+ rel1.relative: 0.0 0;
+ rel2.relative: 0.0 1;
+ rel1.offset: 3 -3;
+ align: 0 0;
fixed: 1 0;
- color: COL_NM;
- text {
- text: "[";
- size: 11;
- align: 0 0.5;
- min: 1 0;
- ellipsis: -1;
- }
+ min: 15 15;
}
}
part { name: "elm.text.size_w";
@@ -1868,8 +1850,8 @@ group { name: "statusbar_layout";
scale: 1;
effect: GLOW;
description { state: "default" 0.0;
- rel1.to_x: "elm.text.size[";
- rel2.to_x: "elm.text.size[";
+ rel1.to_x: "invert_btn";
+ rel2.to_x: "invert_btn";
rel1.relative: 1.0 0.0;
rel2.relative: 1.0 1.0;
align: 0 0.5;
@@ -1926,28 +1908,6 @@ group { name: "statusbar_layout";
}
}
}
- part { name: "elm.text.size]";
- type: TEXT;
- clip_to: "base_clip";
- scale: 1;
- effect: SHADOW BOTTOM;
- description { state: "default" 0.0;
- rel1.to_x: "elm.text.size_h";
- rel2.to_x: "elm.text.size_h";
- rel1.relative: 1.0 0.0;
- rel2.relative: 1.0 1.0;
- align: 0 0.5;
- fixed: 1 0;
- color: COL_NM;
- text {
- text: "]";
- size: 11;
- align: 0 0.5;
- min: 1 0;
- ellipsis: -1;
- }
- }
- }
part { name: "elm.text.cursor_px[";
type: TEXT;
clip_to: "base_clip";
diff --git a/data/themes/default/theme_ext.edc
b/data/themes/default/theme_ext.edc
index 7979a00..67362b3 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -810,7 +810,6 @@ group { name: "elm/scroller/entry/about";
target: "elm.swallow.end";
}
part { name: "glow";
- insert_after: "shadow";
mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "bg";
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 3662736..489f9ce 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -142,10 +142,11 @@ create_statusbar_btn(Evas_Object *layout, const char
*image,
Evas_Object *box = elm_box_add(layout);
Evas_Object *btn = elm_button_add(box);
+ elm_object_style_set(btn, elm_app_name_get());
elm_object_focus_allow_set(btn, EINA_FALSE);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_object_scale_set(btn, 0.5);
+ elm_object_scale_set(btn, 0.8);
evas_object_smart_callback_add(btn, "clicked", func, data);
evas_object_show(btn);
--
