diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc index 7f22ceb403..07d6f6f42c 100644 --- a/data/elementary/themes/edc/border.edc +++ b/data/elementary/themes/edc/border.edc @@ -433,9 +433,9 @@ group { name: "e/widgets/border/default/border"; rel.to: "top"; rel2.relative: 0.0 0.0; rel2.offset: 31 3; - min: 40 6; + min: RSZMINW RSZMINH; align: 1.0 1.0; - color: 0 0 0 0; // no cc + color: RSZCOL; // no cc fixed: 1 1; offscale; } @@ -447,9 +447,9 @@ group { name: "e/widgets/border/default/border"; rel1.to: "e.event.resize.tl"; rel2.relative: 0.0 1.0; rel2.to: "e.event.resize.tr"; - min: 0 6; + min: 0 RSZMINH; align: 0.5 1.0; - color: 0 0 0 0; // no cc + color: RSZCOL2; // no cc fixed: 1 1; } } @@ -461,9 +461,9 @@ group { name: "e/widgets/border/default/border"; rel1.offset: -32 0; rel2.relative: 1.0 0.0; rel2.offset: -1 3; - min: 40 6; + min: RSZMINW RSZMINH; align: 0.0 1.0; - color: 0 0 0 0; // no cc + color: RSZCOL; // no cc fixed: 1 1; offscale; } @@ -506,9 +506,9 @@ group { name: "e/widgets/border/default/border"; rel.to: "bottom"; rel2.relative: 0.0 1.0; rel2.offset: 31 -1; - min: 40 10; - align: 0.0 0.5; - color: 0 0 0 0; // no cc + min: RSZMINW RSZMINH; + align: 1.0 0.0; + color: RSZCOL; // no cc fixed: 1 1; offscale; } @@ -530,9 +530,9 @@ group { name: "e/widgets/border/default/border"; rel1.relative: 1.0 0.0; rel2.to: "e.event.resize.br"; rel2.relative: 0.0 1.0; - min: 0 10; - align: 0.5 0.5; - color: 0 0 0 0; // no cc + min: 0 RSZMINH; + align: 0.5 0.0; + color: RSZCOL2; // no cc fixed: 1 1; offscale; } @@ -553,9 +553,9 @@ group { name: "e/widgets/border/default/border"; rel.to: "bottom"; rel1.relative: 1.0 0.0; rel1.offset: -32 0; - min: 40 10; - align: 0.0 0.5; - color: 0 0 0 0; // no cc + min: RSZMINW RSZMINH; + align: 0.0 0.0; + color: RSZCOL; // no cc fixed: 1 1; offscale; } diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc index 3d3c79f7b6..5e239a5baa 100644 --- a/data/elementary/themes/edc/efl/border.edc +++ b/data/elementary/themes/edc/efl/border.edc @@ -490,9 +490,9 @@ group { "efl/border"; data.item: "version" "123"; rel.to: "top_clip"; rel2.relative: 0.0 0.0; rel2.offset: 31 3; - min: 40 6; + min: RSZMINW RSZMINH; align: 1.0 1.0; - color: 0 0 0 0; // no cc + color: RSZCOL; // no cc fixed: 1 1; } desc { "hidden"; inherit: "default"; hid; } @@ -505,9 +505,9 @@ group { "efl/border"; data.item: "version" "123"; rel1.relative: 1.0 0.0; rel2.to: "efl.event.resize.tr"; rel2.relative: 0.0 1.0; - min: 0 6; - align: 0.5 1.0; - color: 0 0 0 0; // no cc + min: 0 RSZMINH; + align: 1.0 1.0; + color: RSZCOL2; // no cc fixed: 1 1; } desc { "hidden"; inherit: "default"; hid; } @@ -521,9 +521,9 @@ group { "efl/border"; data.item: "version" "123"; rel1.offset: -32 0; rel2.relative: 1.0 0.0; rel2.offset: -1 3; - min: 40 6; + min: RSZMINW RSZMINH; align: 0.0 1.0; - color: 0 0 0 0; // no cc + color: RSZCOL; // no cc fixed: 1 1; } desc { "hidden"; inherit: "default"; hid; } @@ -573,9 +573,9 @@ group { "efl/border"; data.item: "version" "123"; rel.to: "bottom_clip"; rel2.relative: 0.0 1.0; rel2.offset: 31 -1; - min: 40 10; - align: 0.0 0.5; - color: 0 0 0 0; // no cc + min: RSZMINW RSZMINH; + align: 1.0 0.0; + color: RSZCOL; // no cc fixed: 1 1; offscale; } @@ -589,9 +589,9 @@ group { "efl/border"; data.item: "version" "123"; rel1.relative: 1.0 0.0; rel2.to: "efl.event.resize.br"; rel2.relative: 0.0 1.0; - min: 0 10; - align: 0.5 0.5; - color: 0 0 0 0; // no cc + min: 0 RSZMINH; + align: 0.5 0.0; + color: RSZCOL2; // no cc fixed: 1 1; offscale; } @@ -604,9 +604,9 @@ group { "efl/border"; data.item: "version" "123"; rel.to: "bottom_clip"; rel1.relative: 1.0 0.0; rel1.offset: -32 0; - min: 40 10; - align: 0.0 0.5; - color: 0 0 0 0; // no cc + min: RSZMINW RSZMINH; + align: 0.0 0.0; + color: RSZCOL; // no cc fixed: 1 1; offscale; } diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc index dc721a14aa..8f56316fa5 100644 --- a/data/elementary/themes/edc/elm/border.edc +++ b/data/elementary/themes/edc/elm/border.edc @@ -497,9 +497,9 @@ group { name: "elm/border/base/default"; rel.to: "top_clip"; rel2.relative: 0.0 0.0; rel2.offset: 31 3; - min: 40 6; + min: RSZMINW RSZMINH; align: 1.0 1.0; - color: 0 0 0 0; // no cc + color: RSZCOL; // no cc fixed: 1 1; } desc { "hidden"; inherit: "default"; hid; } @@ -512,9 +512,9 @@ group { name: "elm/border/base/default"; rel1.relative: 1.0 0.0; rel2.to: "elm.event.resize.tr"; rel2.relative: 0.0 1.0; - min: 0 6; + min: 0 RSZMINH; align: 0.5 1.0; - color: 0 0 0 0; // no cc + color: RSZCOL2; // no cc fixed: 1 1; } desc { "hidden"; inherit: "default"; hid; } @@ -528,9 +528,9 @@ group { name: "elm/border/base/default"; rel1.offset: -32 0; rel2.relative: 1.0 0.0; rel2.offset: -1 3; - min: 40 6; + min: RSZMINW RSZMINH; align: 0.0 1.0; - color: 0 0 0 0; // no cc + color: RSZCOL; // no cc fixed: 1 1; } desc { "hidden"; inherit: "default"; hid; } @@ -580,9 +580,9 @@ group { name: "elm/border/base/default"; rel.to: "bottom_clip"; rel2.relative: 0.0 1.0; rel2.offset: 31 -1; - min: 40 10; - align: 0.0 0.5; - color: 0 0 0 0; // no cc + min: RSZMINW RSZMINH; + align: 1.0 0.0; + color: RSZCOL; // no cc fixed: 1 1; offscale; } @@ -596,9 +596,9 @@ group { name: "elm/border/base/default"; rel1.relative: 1.0 0.0; rel2.to: "elm.event.resize.br"; rel2.relative: 0.0 1.0; - min: 0 10; - align: 0.5 0.5; - color: 0 0 0 0; // no cc + min: 0 RSZMINH; + align: 0.5 0.0; + color: RSZCOL2; // no cc fixed: 1 1; offscale; } @@ -611,9 +611,9 @@ group { name: "elm/border/base/default"; rel.to: "bottom_clip"; rel1.relative: 1.0 0.0; rel1.offset: -32 0; - min: 40 10; - align: 0.0 0.5; - color: 0 0 0 0; // no cc + min: RSZMINW RSZMINH; + align: 0.0 0.0; + color: RSZCOL; // no cc fixed: 1 1; offscale; } diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc index fe104b5da4..f23920cb2a 100644 --- a/data/elementary/themes/macros.edc +++ b/data/elementary/themes/macros.edc @@ -9,6 +9,10 @@ #define SHELFPAD 3 #define ICMIN 15 +#define RSZCOL 0 0 0 0 +#define RSZCOL2 0 0 0 0 +#define RSZMINW 44 +#define RSZMINH 10 #define SPACER_TEXT "NN";