summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/themes/default.edc29
-rw-r--r--src/bin/win.c16
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 {
1016 target: "tab_bevel_shad1"; 1016 target: "tab_bevel_shad1";
1017 target: "tab_bevel_shad3"; 1017 target: "tab_bevel_shad3";
1018 target: "tab_bevel_shad4"; 1018 target: "tab_bevel_shad4";
1019 target: "tabtitle"; 1019 //target: "tabtitle";
1020 target: "terminology.tab.title";
1020 target: "tabclose"; 1021 target: "tabclose";
1021 } 1022 }
1022 program { 1023 program {
@@ -1042,7 +1043,8 @@ collections {
1042 target: "tab_bevel_shad1"; 1043 target: "tab_bevel_shad1";
1043 target: "tab_bevel_shad3"; 1044 target: "tab_bevel_shad3";
1044 target: "tab_bevel_shad4"; 1045 target: "tab_bevel_shad4";
1045 target: "tabtitle"; 1046 //target: "tabtitle";
1047 target: "terminology.tab.title";
1046 target: "tabclose"; 1048 target: "tabclose";
1047 } 1049 }
1048 1050
@@ -1086,8 +1088,28 @@ collections {
1086 } 1088 }
1087 } 1089 }
1088 1090
1089 part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
1090 /* TODO: boris */ 1091 /* TODO: boris */
1092 part { name: "terminology.tab.title";
1093 type: SWALLOW;
1094 mouse_events: 0;
1095 scale: 1;
1096 description { state: "default" 0.0;
1097 align: 0.5 0.5;
1098 rel1.to_x: "tab_bevel_top2";
1099 rel1.offset: 0 2;
1100 rel2.to_x: "tab_bevel_top2";
1101 rel2.offset: -1 2;
1102 rel2.relative: 1.0 0.0;
1103 visible: 0;
1104 fixed: 1 1;
1105 }
1106 description { state: "tab" 0.0;
1107 inherit: "default" 0.0;
1108 visible: 1;
1109 }
1110 }
1111 /*
1112 part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
1091 scale: 1; 1113 scale: 1;
1092 effect: SOFT_SHADOW BOTTOM; 1114 effect: SOFT_SHADOW BOTTOM;
1093 mouse_events: 0; 1115 mouse_events: 0;
@@ -1133,6 +1155,7 @@ collections {
1133 visible: 1; 1155 visible: 1;
1134 } 1156 }
1135 } 1157 }
1158 */
1136 part { name: "tablimit0"; type: SPACER; 1159 part { name: "tablimit0"; type: SPACER;
1137 description { state: "default" 0.0; 1160 description { state: "default" 0.0;
1138 rel1.to_y: "terminology.tab"; 1161 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)
1649 edje_object_message_signal_process(tm->bg); 1649 edje_object_message_signal_process(tm->bg);
1650 edje_object_part_unswallow(tm->bg, tm->tab_spacer); 1650 edje_object_part_unswallow(tm->bg, tm->tab_spacer);
1651 evas_object_del(tm->tab_spacer); 1651 evas_object_del(tm->tab_spacer);
1652 Evas_Object *o; 1652 o = edje_object_part_swallow_get(tm->bg, "terminology.tab.title");
1653 o = edje_object_part_swallow_get(term->bg, "terminology.tab.title");
1654 evas_object_del(o); 1653 evas_object_del(o);
1655 tm->tab_spacer = NULL; 1654 tm->tab_spacer = NULL;
1656 } 1655 }
@@ -2623,6 +2622,7 @@ _tabs_refresh(Tabs *tabs)
2623 if (!term->tab_spacer) 2622 if (!term->tab_spacer)
2624 { 2623 {
2625 Evas_Object *o; 2624 Evas_Object *o;
2625 Evas_Coord ow, oh;
2626 term->tab_spacer = evas_object_rectangle_add( 2626 term->tab_spacer = evas_object_rectangle_add(
2627 evas_object_evas_get(term->bg)); 2627 evas_object_evas_get(term->bg));
2628 evas_object_color_set(term->tab_spacer, 0, 0, 0, 0); 2628 evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
@@ -2632,8 +2632,16 @@ _tabs_refresh(Tabs *tabs)
2632 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0); 2632 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0);
2633 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0); 2633 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0);
2634 /* TODO: boris */ 2634 /* TODO: boris */
2635 edje_object_part_text_set(term->bg, "terminology.tab.title", 2635 //edje_object_part_text_set(term->bg, "terminology.tab.title",
2636 solo->tc.title); 2636 // solo->tc.title);
2637 o = evas_object_text_add(evas_object_evas_get(term->bg));
2638 /* TODO boris: style */
2639 evas_object_text_text_set(o, solo->tc.title);
2640 evas_object_scale_set(o, elm_config_scale_get());
2641 evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
2642 evas_object_size_hint_min_set(o, ow, oh);
2643 edje_object_part_swallow(term->bg, "terminology.tab.title", o);
2644
2637 edje_object_signal_emit(term->bg, "tabbar,on", "terminology"); 2645 edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
2638 edje_object_message_signal_process(term->bg); 2646 edje_object_message_signal_process(term->bg);
2639 } 2647 }