TH - improve border scaling some more

2 files changed, 125 insertions, 129 deletions

diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index 385b66ea34..4c6d4cdb0d 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -139,14 +139,14 @@ group { name: "e/widgets/border/default/border";
    parts {
       part { name: "shadow_clip"; type: RECT; mouse_events: 0;
          description { state: "default";
-            rel1.to: "shadow";
-            rel2.to: "shadow";
+            rel.to: "shadow";
          }
          description { state: "hidden";
             visible: 0;
          }
       }
       part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip";
+         scale: 1;
          description { state: "default" 0.0;
             rel1.to: "top";
             rel2.to: "bottom";
@@ -170,10 +170,10 @@ group { name: "e/widgets/border/default/border";
       part { name: "e.swallow.client"; type: SWALLOW;
          clip_to: "client_clip";
          description { state: "default" 0.0;
-            rel1.relative: 0.0 1.0;
             rel1.to_y: "top";
-            rel2.relative: 1.0 0.0;
+            rel1.relative: 0.0 1.0;
             rel2.to_y: "bottom";
+            rel2.relative: 1.0 0.0;
          }
          description { state: "shaded" 0.0;
             inherit: "default" 0.0;
@@ -187,10 +187,12 @@ group { name: "e/widgets/border/default/border";
          }
       }
       part { name: "top"; type: RECT; mouse_events: 0;
+//         scale: 1;
          description { state: "default" 0.0;
             rel2.to_y: "e.text.title";
             rel2.offset: -1 3;
             color: 64 64 64 255;
+//            offscale;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
@@ -215,6 +217,7 @@ group { name: "e/widgets/border/default/border";
                min: 0 1;
             }
             fixed: 0 1;
+//            offscale;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
@@ -223,8 +226,7 @@ group { name: "e/widgets/border/default/border";
       }
       part { name: "icon"; type: SPACER;
          description { state: "default" 0.0;
-            rel1.to: "e.event.icon";
-            rel2.to: "e.event.icon";
+            rel.to: "e.event.icon";
          }
          description { state: "bounce1" 0.0;
             inherit: "default" 0.0;
@@ -239,9 +241,8 @@ group { name: "e/widgets/border/default/border";
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "icon";
+            rel.to: "icon";
             rel1.relative: 0.15 0.15;
-            rel2.to: "icon";
             rel2.relative: 0.85 0.85;
             rel2.offset: 0 0;
          }
@@ -260,8 +261,7 @@ group { name: "e/widgets/border/default/border";
       BUSY("busy_area", "e,state,hung", "e", "e,state,unhung", "e")
       part { name: "clip1"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "top";
-            rel2.to: "top";
+            rel.to: "top";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
@@ -270,8 +270,7 @@ group { name: "e/widgets/border/default/border";
       }
       part { name: "clip2"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "top";
-            rel2.to: "top";
+            rel.to: "top";
             visible: 0;
          }
          description { state: "focused" 0.0;
@@ -282,10 +281,8 @@ group { name: "e/widgets/border/default/border";
       part { name: "close1";  mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "border_close.png";
-            rel1.to: "e.event.close";
-            rel2.to: "e.event.close";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "e.event.close";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -298,10 +295,8 @@ group { name: "e/widgets/border/default/border";
          clip_to: "clip1";
          description { state: "default" 0.0;
             image.normal: "border_maximize.png";
-            rel1.to: "e.event.maximize";
-            rel2.to: "e.event.maximize";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "e.event.maximize";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -314,10 +309,8 @@ group { name: "e/widgets/border/default/border";
          clip_to: "clip1";
          description { state: "default" 0.0;
             image.normal: "border_minimize.png";
-            rel1.to: "e.event.minimize";
-            rel2.to: "e.event.minimize";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "e.event.minimize";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -330,10 +323,8 @@ group { name: "e/widgets/border/default/border";
          clip_to: "clip2";
          description { state: "default" 0.0;
             image.normal: "border_close.png";
-            rel1.to: "e.event.close";
-            rel2.to: "e.event.close";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "e.event.close";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 255 255 255 255;
          }
@@ -346,10 +337,8 @@ group { name: "e/widgets/border/default/border";
          clip_to: "clip2";
          description { state: "default" 0.0;
             image.normal: "border_maximize.png";
-            rel1.to: "e.event.maximize";
-            rel2.to: "e.event.maximize";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "e.event.maximize";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 255 255 255 255;
          }
@@ -362,10 +351,8 @@ group { name: "e/widgets/border/default/border";
          clip_to: "clip2";
          description { state: "default" 0.0;
             image.normal: "border_minimize.png";
-            rel1.to: "e.event.minimize";
-            rel2.to: "e.event.minimize";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "e.event.minimize";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 255 255 255 255;
          }
@@ -428,45 +415,57 @@ group { name: "e/widgets/border/default/border";
          }
       }
       part { name: "e.event.resize.tl"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
+            rel.to: "top";
             rel2.relative: 0.0 0.0;
-            min: 32 4;
-            align: 0.0 0.0;
+            rel2.offset: 31 3;
+            min: 40 6;
+            align: 1.0 1.0;
             color: 0 0 0 0;
+            fixed: 1 1;
+            offscale;
          }
       }
       part { name: "e.event.resize.t"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            fixed: 0 1;
             rel1.relative: 1.0 0.0;
-            rel1.to_x: "e.event.resize.tl";
-            rel2.relative: 0.0 0.0;
-            rel2.to_x: "e.event.resize.tr";
-            min: 0 4;
-            align: 0.5 0.0;
+            rel1.to: "e.event.resize.tl";
+            rel2.relative: 0.0 1.0;
+            rel2.to: "e.event.resize.tr";
+            min: 0 6;
+            align: 0.5 1.0;
             color: 0 0 0 0;
+            fixed: 1 1;
          }
       }
       part { name: "e.event.resize.tr"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
+            rel.to: "top";
             rel1.relative: 1.0 0.0;
+            rel1.offset: -32 0;
             rel2.relative: 1.0 0.0;
-            min: 32 4;
-            align: 1.0 0.0;
+            rel2.offset: -1 3;
+            min: 40 6;
+            align: 0.0 1.0;
             color: 0 0 0 0;
+            fixed: 1 1;
+            offscale;
          }
       }
       part { name: "bottom"; type: RECT; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             color_class: "border_bottom";
             color: 64 64 64 255;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 -5;
             rel2.relative: 1.0 1.0;
+            align: 0.5 1.0;
             min: 0 5;
             fixed: 0 1;
+            offscale;
          }
          description { state: "shaded" 0.0;
             inherit: "default" 0.0;
@@ -480,15 +479,16 @@ group { name: "e/widgets/border/default/border";
          }
       }
       part { name: "e.event.resize.bl"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.relative: 0.0 1.0;
-            rel1.to_y: "e.swallow.client";
-            rel1.offset: 0 -1;
+            rel.to: "bottom";
             rel2.relative: 0.0 1.0;
-            min: 32 5;
-            align: 0.0 1.0;
+            rel2.offset: 31 -1;
+            min: 40 10;
+            align: 0.0 0.5;
             color: 0 0 0 0;
             fixed: 1 1;
+            offscale;
          }
          description { state: "shaded" 0.0;
             inherit: "default" 0.0;
@@ -502,16 +502,17 @@ group { name: "e/widgets/border/default/border";
          }
       }
       part { name: "e.event.resize.b"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
+            rel1.to: "e.event.resize.bl";
             rel1.relative: 1.0 0.0;
-            rel1.to_x: "e.event.resize.tl";
-            rel1.to_y: "bottom";
+            rel2.to: "e.event.resize.br";
             rel2.relative: 0.0 1.0;
-            rel2.to_x: "e.event.resize.tr";
-            min: 0 5;
-            align: 0.5 1.0;
+            min: 0 10;
+            align: 0.5 0.5;
             color: 0 0 0 0;
-            fixed: 0 1;
+            fixed: 1 1;
+            offscale;
          }
          description { state: "shaded" 0.0;
             inherit: "default" 0.0;
@@ -525,15 +526,16 @@ group { name: "e/widgets/border/default/border";
          }
       }
       part { name: "e.event.resize.br"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.relative: 1.0 1.0;
-            rel1.to_y: "e.swallow.client";
-            rel1.offset: 0 -1;
-            rel2.relative: 1.0 1.0;
-            min: 32 5;
-            align: 1.0 1.0;
+            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;
             fixed: 1 1;
+            offscale;
          }
          description { state: "shaded" 0.0;
             inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index e0943b3b95..579eb79b0b 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -162,12 +162,14 @@ group { name: "elm/border/base/default";
 
       /* top title bar - spacer and clipper */
       rect { "top_clip"; //nomouse;
+//         scale: 1;
          desc { "default";
             rel1.to: "shadow_spacer";
             rel2.to_y: "elm.text.title";
             rel2.to_x: "shadow_spacer";
             rel2.offset: -1 3;
             vis;
+//            offscale;
          }
          desc { "hidden";
             inherit: "default";
@@ -216,6 +218,7 @@ group { name: "elm/border/base/default";
                min: 0 1;
             }
             fixed: 0 1;
+//            offscale;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
@@ -224,8 +227,7 @@ group { name: "elm/border/base/default";
       }
       spacer {  "icon";
          desc { "default";
-            rel1.to: "elm.event.icon";
-            rel2.to: "elm.event.icon";
+            rel.to: "elm.event.icon";
          }
          desc { "bounce1";
             inherit: "default";
@@ -280,8 +282,7 @@ group { name: "elm/border/base/default";
          clip: "busy_clip";
          desc { "default";
             fixed: 1 1;
-            rel1.to: "knob";
-            rel2.to: "knob";
+            rel.to: "knob";
             image.normal: "glow_round_corners_small.png";
             map.on: 1;
             map.smooth: 1;
@@ -294,8 +295,7 @@ group { name: "elm/border/base/default";
       }
       rect {  "clip1"; nomouse;
          desc { "default";
-            rel1.to: "top_clip";
-            rel2.to: "top_clip";
+            rel.to: "top_clip";
          }
          desc { "focused";
             inherit: "default";
@@ -304,8 +304,7 @@ group { name: "elm/border/base/default";
       }
       rect {  "clip2"; nomouse;
          desc { "default";
-            rel1.to: "top_clip";
-            rel2.to: "top_clip";
+            rel.to: "top_clip";
             visible: 0;
          }
          desc { "focused";
@@ -317,10 +316,8 @@ group { name: "elm/border/base/default";
          clip: "clip1";
          desc { "default";
             image.normal: "border_close.png";
-            rel1.to: "elm.event.close";
-            rel2.to: "elm.event.close";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "elm.event.close";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -333,10 +330,8 @@ group { name: "elm/border/base/default";
          clip: "clip1";
          desc { "default";
             image.normal: "border_maximize.png";
-            rel1.to: "elm.event.maximize";
-            rel2.to: "elm.event.maximize";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "elm.event.maximize";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -349,10 +344,8 @@ group { name: "elm/border/base/default";
          clip: "clip1";
          desc { "default";
             image.normal: "border_minimize.png";
-            rel1.to: "elm.event.minimize";
-            rel2.to: "elm.event.minimize";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "elm.event.minimize";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -365,10 +358,8 @@ group { name: "elm/border/base/default";
          clip: "clip2";
          desc { "default";
             image.normal: "border_close.png";
-            rel1.to: "elm.event.close";
-            rel2.to: "elm.event.close";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "elm.event.close";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -381,10 +372,8 @@ group { name: "elm/border/base/default";
          clip: "clip2";
          desc { "default";
             image.normal: "border_maximize.png";
-            rel1.to: "elm.event.maximize";
-            rel2.to: "elm.event.maximize";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "elm.event.maximize";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -397,10 +386,8 @@ group { name: "elm/border/base/default";
          clip: "clip2";
          desc { "default";
             image.normal: "border_minimize.png";
-            rel1.to: "elm.event.minimize";
-            rel2.to: "elm.event.minimize";
-            min: 15 15;
-            max: 15 15;
+            rel.to: "elm.event.minimize";
+            min: 15 15; max: 15 15;
             fixed: 1 1;
             color: 160 160 160 255;
          }
@@ -482,11 +469,13 @@ group { name: "elm/border/base/default";
       }
       rect {  "elm.event.resize.tl";
          clip: "top_resize_clip";
+         scale: 1;
          desc { "default";
             rel.to: "top_clip";
             rel2.relative: 0.0 0.0;
-            min: 32 4;
-            align: 0.0 0.0;
+            rel2.offset: 31 3;
+            min: 40 6;
+            align: 1.0 1.0;
             color: 0 0 0 0;
             fixed: 1 1;
          }
@@ -494,15 +483,14 @@ group { name: "elm/border/base/default";
       }
       rect {  "elm.event.resize.t";
          clip: "top_resize_clip";
+         scale: 1;
          desc { "default";
+            rel1.to: "elm.event.resize.tl";
             rel1.relative: 1.0 0.0;
-            rel1.to_y: "top_clip";
-            rel1.to_x: "elm.event.resize.tl";
-            rel2.relative: 0.0 0.0;
-            rel2.to_x: "elm.event.resize.tr";
-            rel2.to_y: "top_clip";
-            min: 0 4;
-            align: 0.5 0.0;
+            rel2.to: "elm.event.resize.tr";
+            rel2.relative: 0.0 1.0;
+            min: 0 6;
+            align: 0.5 1.0;
             color: 0 0 0 0;
             fixed: 1 1;
          }
@@ -510,12 +498,15 @@ group { name: "elm/border/base/default";
       }
       rect {  "elm.event.resize.tr";
          clip: "top_resize_clip";
+         scale: 1;
          desc { "default";
             rel.to: "top_clip";
             rel1.relative: 1.0 0.0;
+            rel1.offset: -32 0;
             rel2.relative: 1.0 0.0;
-            min: 32 4;
-            align: 1.0 0.0;
+            rel2.offset: -1 3;
+            min: 40 6;
+            align: 0.0 1.0;
             color: 0 0 0 0;
             fixed: 1 1;
          }
@@ -531,6 +522,7 @@ group { name: "elm/border/base/default";
          }
       }
       rect { "bottom_clip";
+         scale: 1;
          desc { "default";
             rel.to: "shadow_spacer";
             rel1 { relative: 0.0 1.0; offset: 0 -5; }
@@ -551,48 +543,50 @@ group { name: "elm/border/base/default";
             rel.to: "bottom_clip";
          }
       }
+
       rect {  "elm.event.resize.bl";
          clip: "bottom_clip";
+         scale: 1;
          desc { "default";
-            rel1.relative: 0.0 1.0;
-            rel1.to: "bottom_clip";
+            rel.to: "bottom_clip";
             rel2.relative: 0.0 1.0;
-            rel2.to: "bottom_clip";
-            min: 32 5;
-            align: 0.0 1.0;
+            rel2.offset: 31 -1;
+            min: 40 10;
+            align: 0.0 0.5;
             color: 0 0 0 0;
             fixed: 1 1;
+            offscale;
          }
          desc { "hidden"; inherit: "default"; hid; }
       }
       rect {  "elm.event.resize.b";
          clip: "bottom_clip";
+         scale: 1;
          desc { "default";
-            rel1.relative: 1.0 1.0;
-            rel1.to_x: "elm.event.resize.tl";
-            rel1.to_y: "bottom_clip";
-            rel1.offset: 0 -1;
+            rel1.to: "elm.event.resize.bl";
+            rel1.relative: 1.0 0.0;
+            rel2.to: "elm.event.resize.br";
             rel2.relative: 0.0 1.0;
-            rel2.to_x: "elm.event.resize.tr";
-            rel2.to_y: "bottom_clip";
-            min: 0 5;
-            align: 0.5 1.0;
+            min: 0 10;
+            align: 0.5 0.5;
             color: 0 0 0 0;
-            fixed: 0 1;
+            fixed: 1 1;
+            offscale;
          }
          desc { "hidden"; inherit: "default"; hid; }
       }
       rect {  "elm.event.resize.br";
          clip: "bottom_clip";
+         scale: 1;
          desc { "default";
-            rel1.relative: 1.0 1.0;
-            rel1.to: "bottom_clip";
-            rel2.relative: 1.0 1.0;
-            rel2.to: "bottom_clip";
-            min: 32 5;
-            align: 1.0 1.0;
+            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;
             fixed: 1 1;
+            offscale;
          }
          desc { "hidden"; inherit: "default"; hid; }
       }