summaryrefslogtreecommitdiff
path: root/data/elementary/themes
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-01-16 16:37:51 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-01-16 16:37:51 +0000
commit785ad1a8a4a8a70529b23e97f1a5cf10f2a30113 (patch)
tree724224f5800be6e77f369b36dfcd5bf60a5827f3 /data/elementary/themes
parenta3d13013e4200d2b2e1f89ae33310b3ea160c015 (diff)
TH - fix toolbar item sizing
Diffstat (limited to 'data/elementary/themes')
-rw-r--r--data/elementary/themes/edc/elm/toolbar.edc47
1 files changed, 46 insertions, 1 deletions
diff --git a/data/elementary/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc
index 310f8dd5c4..070eaa881d 100644
--- a/data/elementary/themes/edc/elm/toolbar.edc
+++ b/data/elementary/themes/edc/elm/toolbar.edc
@@ -357,40 +357,56 @@ group { name: "elm/toolbar/item/default";
357 if (m1 == (ICON | LABEL)) { 357 if (m1 == (ICON | LABEL)) {
358 if (!d) { 358 if (!d) {
359 set_state(PART:"elm.swallow.icon", "default", 0.0); 359 set_state(PART:"elm.swallow.icon", "default", 0.0);
360 set_state(PART:"elm.swallow.icon_new", "default", 0.0);
361 set_state(PART:"sizer_content", "default", 0.0);
360 set_state(PART:"icon_clip", "default", 0.0); 362 set_state(PART:"icon_clip", "default", 0.0);
361 set_state(PART:"elm.text", "default", 0.0); 363 set_state(PART:"elm.text", "default", 0.0);
362 } else { 364 } else {
363 set_state(PART:"elm.swallow.icon", "default", 0.0); 365 set_state(PART:"elm.swallow.icon", "default", 0.0);
366 set_state(PART:"elm.swallow.icon_new", "default", 0.0);
367 set_state(PART:"sizer_content", "default", 0.0);
364 set_state(PART:"icon_clip", "disabled", 0.0); 368 set_state(PART:"icon_clip", "disabled", 0.0);
365 set_state(PART:"elm.text", "disabled", 0.0); 369 set_state(PART:"elm.text", "disabled", 0.0);
366 } 370 }
367 } else if (m1 == (ICON)) { 371 } else if (m1 == (ICON)) {
368 if (!d) { 372 if (!d) {
369 set_state(PART:"elm.swallow.icon", "icononly", 0.0); 373 set_state(PART:"elm.swallow.icon", "icononly", 0.0);
374 set_state(PART:"elm.swallow.icon_new", "icononly", 0.0);
375 set_state(PART:"sizer_content", "icononly", 0.0);
370 set_state(PART:"icon_clip", "default", 0.0); 376 set_state(PART:"icon_clip", "default", 0.0);
371 set_state(PART:"elm.text", "icononly", 0.0); 377 set_state(PART:"elm.text", "icononly", 0.0);
372 } else { 378 } else {
373 set_state(PART:"elm.swallow.icon", "icononly", 0.0); 379 set_state(PART:"elm.swallow.icon", "icononly", 0.0);
380 set_state(PART:"elm.swallow.icon_new", "icononly", 0.0);
381 set_state(PART:"sizer_content", "icononly", 0.0);
374 set_state(PART:"icon_clip", "disabled", 0.0); 382 set_state(PART:"icon_clip", "disabled", 0.0);
375 set_state(PART:"elm.text", "icononly", 0.0); 383 set_state(PART:"elm.text", "icononly", 0.0);
376 } 384 }
377 } else if (m1 == (LABEL)) { 385 } else if (m1 == (LABEL)) {
378 if (!d) { 386 if (!d) {
379 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 387 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
388 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
389 set_state(PART:"sizer_content", "noicon", 0.0);
380 set_state(PART:"icon_clip", "default", 0.0); 390 set_state(PART:"icon_clip", "default", 0.0);
381 set_state(PART:"elm.text", "noicon", 0.0); 391 set_state(PART:"elm.text", "noicon", 0.0);
382 } else { 392 } else {
383 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 393 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
394 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
395 set_state(PART:"sizer_content", "noicon", 0.0);
384 set_state(PART:"icon_clip", "disabled", 0.0); 396 set_state(PART:"icon_clip", "disabled", 0.0);
385 set_state(PART:"elm.text", "noicon_disabled", 0.0); 397 set_state(PART:"elm.text", "noicon_disabled", 0.0);
386 } 398 }
387 } else { 399 } else {
388 if (!d) { 400 if (!d) {
389 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 401 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
402 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
403 set_state(PART:"sizer_content", "noicon", 0.0);
390 set_state(PART:"icon_clip", "default", 0.0); 404 set_state(PART:"icon_clip", "default", 0.0);
391 set_state(PART:"elm.text", "noicon", 0.0); 405 set_state(PART:"elm.text", "noicon", 0.0);
392 } else { 406 } else {
393 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 407 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
408 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
409 set_state(PART:"sizer_content", "noicon", 0.0);
394 set_state(PART:"icon_clip", "disabled", 0.0); 410 set_state(PART:"icon_clip", "disabled", 0.0);
395 set_state(PART:"elm.text", "noicon_disabled", 0.0); 411 set_state(PART:"elm.text", "noicon_disabled", 0.0);
396 } 412 }
@@ -409,7 +425,7 @@ group { name: "elm/toolbar/item/default";
409 visible: 1; 425 visible: 1;
410 } 426 }
411 } 427 }
412 428
413 part { name: "icon_clip"; type: RECT; 429 part { name: "icon_clip"; type: RECT;
414 description { state: "default" 0.0; 430 description { state: "default" 0.0;
415 } 431 }
@@ -430,6 +446,33 @@ group { name: "elm/toolbar/item/default";
430 visible: 0; 446 visible: 0;
431 } 447 }
432 } 448 }
449 text { "sizer_content"; nomouse; scale: 1;
450 desc { "default";
451 min: 16 16;
452 visible: 0;
453 text { font: FN; size: 10;
454 min: 1 1;
455 text_class: "toolbar_item";
456 }
457 }
458 desc { "noicon"; inherit;
459 rel.to: "elm.swallow.icon";
460 text {
461 min: 0 0;
462 ellipsis: -1;
463 text: SPACER_TEXT;
464 }
465 }
466 desc { "icononly"; inherit;
467 rel.to: "elm.swallow.icon";
468 text {
469 min: 1 1;
470 ellipsis: -1;
471 text: SPACER_TEXT;
472 }
473 }
474 }
475
433 part { name: "elm.swallow.icon"; type: SWALLOW; 476 part { name: "elm.swallow.icon"; type: SWALLOW;
434 clip_to: "icon_clip1"; 477 clip_to: "icon_clip1";
435 scale: 1; 478 scale: 1;
@@ -448,6 +491,7 @@ group { name: "elm/toolbar/item/default";
448 rel1.offset: 4 0; 491 rel1.offset: 4 0;
449 rel2.relative: 1.0 0.0; 492 rel2.relative: 1.0 0.0;
450 rel2.offset: -5 -5; 493 rel2.offset: -5 -5;
494 fixed: 1 1;
451 } 495 }
452 description { state: "icononly" 0.0; 496 description { state: "icononly" 0.0;
453 inherit: "default" 0.0; 497 inherit: "default" 0.0;
@@ -487,6 +531,7 @@ group { name: "elm/toolbar/item/default";
487 rel1.offset: 4 0; 531 rel1.offset: 4 0;
488 rel2.relative: 1.0 0.0; 532 rel2.relative: 1.0 0.0;
489 rel2.offset: -5 0; 533 rel2.offset: -5 0;
534 fixed: 1 1;
490 } 535 }
491 description { state: "icononly" 0.0; 536 description { state: "icononly" 0.0;
492 inherit: "default" 0.0; 537 inherit: "default" 0.0;