billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=02db084b276346160fcea4775dcc156f6036f3ce
commit 02db084b276346160fcea4775dcc156f6036f3ce
Author: Boris Faure <bill...@gmail.com>
Date: Wed Feb 10 23:56:59 2016 +0100
wip
---
data/themes/default.edc | 29 ++++++++++++++++++++++++++---
src/bin/win.c | 16 ++++++++++++----
2 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index fcd7302..69cb4d7 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1016,7 +1016,8 @@ collections {
target: "tab_bevel_shad1";
target: "tab_bevel_shad3";
target: "tab_bevel_shad4";
- target: "tabtitle";
+ //target: "tabtitle";
+ target: "terminology.tab.title";
target: "tabclose";
}
program {
@@ -1042,7 +1043,8 @@ collections {
target: "tab_bevel_shad1";
target: "tab_bevel_shad3";
target: "tab_bevel_shad4";
- target: "tabtitle";
+ //target: "tabtitle";
+ target: "terminology.tab.title";
target: "tabclose";
}
@@ -1086,8 +1088,28 @@ collections {
}
}
- part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
/* TODO: boris */
+ part { name: "terminology.tab.title";
+ type: SWALLOW;
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ align: 0.5 0.5;
+ rel1.to_x: "tab_bevel_top2";
+ rel1.offset: 0 2;
+ rel2.to_x: "tab_bevel_top2";
+ rel2.offset: -1 2;
+ rel2.relative: 1.0 0.0;
+ visible: 0;
+ fixed: 1 1;
+ }
+ description { state: "tab" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ /*
+ part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SOFT_SHADOW BOTTOM;
mouse_events: 0;
@@ -1133,6 +1155,7 @@ collections {
visible: 1;
}
}
+ */
part { name: "tablimit0"; type: SPACER;
description { state: "default" 0.0;
rel1.to_y: "terminology.tab";
diff --git a/src/bin/win.c b/src/bin/win.c
index 315dd4c..88aa885 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -1649,8 +1649,7 @@ _tabbar_clear(Term *tm)
edje_object_message_signal_process(tm->bg);
edje_object_part_unswallow(tm->bg, tm->tab_spacer);
evas_object_del(tm->tab_spacer);
- Evas_Object *o;
- o = edje_object_part_swallow_get(term->bg, "terminology.tab.title");
+ o = edje_object_part_swallow_get(tm->bg, "terminology.tab.title");
evas_object_del(o);
tm->tab_spacer = NULL;
}
@@ -2623,6 +2622,7 @@ _tabs_refresh(Tabs *tabs)
if (!term->tab_spacer)
{
Evas_Object *o;
+ Evas_Coord ow, oh;
term->tab_spacer = evas_object_rectangle_add(
evas_object_evas_get(term->bg));
evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
@@ -2632,8 +2632,16 @@ _tabs_refresh(Tabs *tabs)
edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1,
0.0);
edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2,
0.0);
/* TODO: boris */
- edje_object_part_text_set(term->bg, "terminology.tab.title",
- solo->tc.title);
+ //edje_object_part_text_set(term->bg, "terminology.tab.title",
+ // solo->tc.title);
+ o = evas_object_text_add(evas_object_evas_get(term->bg));
+ /* TODO boris: style */
+ evas_object_text_text_set(o, solo->tc.title);
+ evas_object_scale_set(o, elm_config_scale_get());
+ evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
+ evas_object_size_hint_min_set(o, ow, oh);
+ edje_object_part_swallow(term->bg, "terminology.tab.title", o);
+
edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
edje_object_message_signal_process(term->bg);
}
--
