summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/themes/default.edc30
-rw-r--r--src/bin/win.c13
2 files changed, 34 insertions, 9 deletions
diff --git a/data/themes/default.edc b/data/themes/default.edc
index c98e91d..fd7f214 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1287,6 +1287,7 @@ collections {
1287 target: "tableft"; 1287 target: "tableft";
1288 target: "tabmiddle"; 1288 target: "tabmiddle";
1289 target: "tabright"; 1289 target: "tabright";
1290 target: "tab_btn";
1290 target: "bevel"; 1291 target: "bevel";
1291 target: "glintclip"; 1292 target: "glintclip";
1292 target: "tab_bevel_bottom"; 1293 target: "tab_bevel_bottom";
@@ -1313,6 +1314,7 @@ collections {
1313 target: "tableft"; 1314 target: "tableft";
1314 target: "tabmiddle"; 1315 target: "tabmiddle";
1315 target: "tabright"; 1316 target: "tabright";
1317 target: "tab_btn";
1316 target: "bevel"; 1318 target: "bevel";
1317 target: "glintclip"; 1319 target: "glintclip";
1318 target: "tab_bevel_bottom"; 1320 target: "tab_bevel_bottom";
@@ -1332,6 +1334,21 @@ collections {
1332 target: "tabtitle"; 1334 target: "tabtitle";
1333 target: "tabclose"; 1335 target: "tabclose";
1334 } 1336 }
1337 part { name: "tab_btn"; type: RECT;
1338 mouse_events: 0;
1339 description { state: "default" 0.0;
1340 rel1.relative: 1.0 0.0;
1341 rel2.to_y: "tabmiddle";
1342 color: 250 0 250 255;
1343 visible: 0;
1344 min: 64 16;
1345 fixed: 1 1;
1346 }
1347 description { state: "tab" 0.0;
1348 inherit: "default" 0.0;
1349 visible: 1;
1350 }
1351 }
1335 1352
1336 part { name: "terminology.tab"; type: SWALLOW; 1353 part { name: "terminology.tab"; type: SWALLOW;
1337 mouse_events: 0; 1354 mouse_events: 0;
@@ -1348,11 +1365,12 @@ collections {
1348 // some slot for dragable parts to stay in along top edge of bg 1365 // some slot for dragable parts to stay in along top edge of bg
1349 part { name: "tabdrag"; type: SPACER; 1366 part { name: "tabdrag"; type: SPACER;
1350 description { state: "default" 0.0; 1367 description { state: "default" 0.0;
1351 rel2.relative: 1.0 0.0; 1368 rel2.relative: 0.0 0.0;
1369 rel2.to_x: "tab_btn";
1352 fixed: 1 1; 1370 fixed: 1 1;
1353 } 1371 }
1354 } 1372 }
1355 // left boundary of the active tab (ragable 0.0 -> 1.0) 1373 // left boundary of the active tab (dragable 0.0 -> 1.0)
1356 part { name: "terminology.tabl"; type: SPACER; 1374 part { name: "terminology.tabl"; type: SPACER;
1357 dragable.x: 1 1 0; 1375 dragable.x: 1 1 0;
1358 dragable.confine: "tabdrag"; 1376 dragable.confine: "tabdrag";
@@ -1362,12 +1380,13 @@ collections {
1362 fixed: 1 1; 1380 fixed: 1 1;
1363 } 1381 }
1364 } 1382 }
1365 // right boundary of the active tab (ragable 0.0 -> 1.0) 1383 // right boundary of the active tab (dragable 0.0 -> 1.0)
1366 part { name: "terminology.tabr"; type: SPACER; 1384 part { name: "terminology.tabr"; type: SPACER;
1367 dragable.x: 1 1 0; 1385 dragable.x: 1 1 0;
1368 dragable.confine: "tabdrag"; 1386 dragable.confine: "tabdrag";
1369 description { state: "default" 0.0; 1387 description { state: "default" 0.0;
1370 rel2.relative: 1.0 0.0; 1388 rel2.relative: 0.0 0.0;
1389 rel2.to_x: "tab_btn";
1371 max: 1 1; 1390 max: 1 1;
1372 fixed: 1 1; 1391 fixed: 1 1;
1373 } 1392 }
@@ -1461,12 +1480,15 @@ collections {
1461 visible: 1; 1480 visible: 1;
1462 } 1481 }
1463 } 1482 }
1483 /*TODO boris */
1464 part { name: "tabright"; type: RECT; 1484 part { name: "tabright"; type: RECT;
1465 mouse_events: 0; 1485 mouse_events: 0;
1466 description { state: "default" 0.0; 1486 description { state: "default" 0.0;
1467 rel1.to: "terminology.tab"; 1487 rel1.to: "terminology.tab";
1468 rel1.relative: 1.0 0.0; 1488 rel1.relative: 1.0 0.0;
1489 rel2.to_x: "tab_btn";
1469 rel2.to_y: "tabmiddle"; 1490 rel2.to_y: "tabmiddle";
1491 rel2.relative: 0.0 1.0;
1470 color: 0 0 0 0; 1492 color: 0 0 0 0;
1471 visible: 0; 1493 visible: 0;
1472 fixed: 1 1; 1494 fixed: 1 1;
diff --git a/src/bin/win.c b/src/bin/win.c
index 05fdd34..f7ef9bc 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -2899,7 +2899,7 @@ _tabbar_fill(Tabs *tabs)
2899 edje_object_part_swallow(term->bg, "terminology.tabl.content", o); 2899 edje_object_part_swallow(term->bg, "terminology.tabl.content", o);
2900 evas_object_show(o); 2900 evas_object_show(o);
2901 } 2901 }
2902 if (i < (n - 1)) 2902 //if (i < (n - 1))
2903 { 2903 {
2904 term->tabbar.r.box = o = elm_box_add(tabs->tc.wn->win); 2904 term->tabbar.r.box = o = elm_box_add(tabs->tc.wn->win);
2905 elm_box_horizontal_set(o, EINA_TRUE); 2905 elm_box_horizontal_set(o, EINA_TRUE);
@@ -2925,6 +2925,7 @@ _tabbar_fill(Tabs *tabs)
2925 edje_object_part_text_set(o, "terminology.title", 2925 edje_object_part_text_set(o, "terminology.title",
2926 tab_item->tc->title); 2926 tab_item->tc->title);
2927 edje_object_size_min_calc(o, &w, &h); 2927 edje_object_size_min_calc(o, &w, &h);
2928 ERR("back: w:%d h:%d", w, h);
2928 evas_object_size_hint_min_set(o, w, h); 2929 evas_object_size_hint_min_set(o, w, h);
2929 assert(i != j); 2930 assert(i != j);
2930 if (j < i) 2931 if (j < i)
@@ -3884,7 +3885,6 @@ _tabs_refresh(Tabs *tabs)
3884 term->tabcount_spacer); 3885 term->tabcount_spacer);
3885 edje_object_part_text_set(term->bg, "terminology.tabcount.label", buf); 3886 edje_object_part_text_set(term->bg, "terminology.tabcount.label", buf);
3886 edje_object_part_text_set(term->bg, "terminology.tabmissed.label", bufmissed); 3887 edje_object_part_text_set(term->bg, "terminology.tabmissed.label", bufmissed);
3887 edje_object_signal_emit(term->bg, "tabcount,on", "terminology");
3888 // this is all below just for tab bar at the top 3888 // this is all below just for tab bar at the top
3889 if (term->config->show_tabs) 3889 if (term->config->show_tabs)
3890 { 3890 {
@@ -3892,12 +3892,14 @@ _tabs_refresh(Tabs *tabs)
3892 3892
3893 v1 = (double)(i-1) / (double)n; 3893 v1 = (double)(i-1) / (double)n;
3894 v2 = (double)i / (double)n; 3894 v2 = (double)i / (double)n;
3895 edje_object_signal_emit(term->bg, "tabcount,off", "terminology");
3896 elm_coords_finger_size_adjust(1, &w, 1, &h);
3897
3895 if (!term->tab_spacer) 3898 if (!term->tab_spacer)
3896 { 3899 {
3897 term->tab_spacer = evas_object_rectangle_add( 3900 term->tab_spacer = evas_object_rectangle_add(
3898 evas_object_evas_get(term->bg)); 3901 evas_object_evas_get(term->bg));
3899 evas_object_color_set(term->tab_spacer, 0, 0, 0, 0); 3902 evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
3900 elm_coords_finger_size_adjust(1, &w, 1, &h);
3901 evas_object_size_hint_min_set(term->tab_spacer, w, h); 3903 evas_object_size_hint_min_set(term->tab_spacer, w, h);
3902 edje_object_part_swallow(term->bg, "terminology.tab", term->tab_spacer); 3904 edje_object_part_swallow(term->bg, "terminology.tab", term->tab_spacer);
3903 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0); 3905 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0);
@@ -3905,24 +3907,24 @@ _tabs_refresh(Tabs *tabs)
3905 edje_object_part_text_set(term->bg, "terminology.tab.title", 3907 edje_object_part_text_set(term->bg, "terminology.tab.title",
3906 solo->tc.title); 3908 solo->tc.title);
3907 edje_object_signal_emit(term->bg, "tabbar,on", "terminology"); 3909 edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
3908 edje_object_message_signal_process(term->bg);
3909 } 3910 }
3910 else 3911 else
3911 { 3912 {
3912 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0); 3913 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0);
3913 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0); 3914 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0);
3914 edje_object_message_signal_process(term->bg);
3915 } 3915 }
3916 _tabbar_fill(tabs); 3916 _tabbar_fill(tabs);
3917 } 3917 }
3918 else 3918 else
3919 { 3919 {
3920 edje_object_signal_emit(term->bg, "tabcount,on", "terminology");
3920 _tabbar_clear(term); 3921 _tabbar_clear(term);
3921 } 3922 }
3922 if (missed > 0) 3923 if (missed > 0)
3923 edje_object_signal_emit(term->bg, "tabmissed,on", "terminology"); 3924 edje_object_signal_emit(term->bg, "tabmissed,on", "terminology");
3924 else 3925 else
3925 edje_object_signal_emit(term->bg, "tabmissed,off", "terminology"); 3926 edje_object_signal_emit(term->bg, "tabmissed,off", "terminology");
3927 edje_object_message_signal_process(term->bg);
3926} 3928}
3927 3929
3928static Tab_Item* 3930static Tab_Item*
@@ -5788,6 +5790,7 @@ _cb_tabregion_change(void *data,
5788 5790
5789 evas_object_geometry_get(obj, NULL, NULL, &w, &h); 5791 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
5790 evas_object_size_hint_min_set(term->tab_region_base, w, h); 5792 evas_object_size_hint_min_set(term->tab_region_base, w, h);
5793 ERR("tab region %d %d", w ,h);
5791 elm_layout_content_set(term->base, "terminology.tabregion", 5794 elm_layout_content_set(term->base, "terminology.tabregion",
5792 term->tab_region_base); 5795 term->tab_region_base);
5793} 5796}