raster pushed a commit to branch master.

commit 07c2de9f00f11d97a7c9a3c42459106e5b8e9d28
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Thu Jul 4 19:47:32 2013 +0900

    clip panes differently and add bigger drag handles
---
 edje/edc/elm/panes.edc | 58 ++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/edje/edc/elm/panes.edc b/edje/edc/elm/panes.edc
index 52a8578..5910769 100644
--- a/edje/edc/elm/panes.edc
+++ b/edje/edc/elm/panes.edc
@@ -1,3 +1,7 @@
+#define PANEMIN  10
+#define PANEMIN2 16
+#define PANEWID  32
+
 group { name: "elm/panes/vertical/default";
    images.image: "holes_vert.png" COMP;
    parts {
@@ -7,14 +11,16 @@ group { name: "elm/panes/vertical/default";
       }
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.left";
-            rel2.to: "elm.swallow.left";
+            rel2.to_x: "elm.bar";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -4 -1;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.right";
-            rel2.to: "elm.swallow.right";
+            rel1.to_x: "elm.bar";
+            rel1.relative: 0.0 0.0;
+            rel1.offset: 3 0;
          }
       }
       part { name: "elm.swallow.left"; type: SWALLOW;
@@ -57,7 +63,7 @@ group { name: "elm/panes/vertical/default";
       part { name: "elm.swallow.event"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
-            min: 6 16;
+            min: PANEMIN PANEMIN2;
             fixed: 1 1;
             rel1.to: "elm.bar";
             rel2.to: "elm.bar";
@@ -66,7 +72,7 @@ group { name: "elm/panes/vertical/default";
       part { name: "bar"; type: RECT;
          dragable.events: "elm.bar";
          description { state: "default" 0.0;
-            min: 6 32;
+            min: PANEMIN PANEWID;
             max: 99999 99999;
             fixed: 1 1;
             rel1.to_x: "elm.swallow.event";
@@ -86,14 +92,16 @@ group { name: "elm/panes/horizontal/default";
       }
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.left";
-            rel2.to: "elm.swallow.left";
+            rel2.to_y: "elm.bar";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -1 -4;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.right";
-            rel2.to: "elm.swallow.right";
+            rel1.to_y: "elm.bar";
+            rel1.relative: 0.0 0.0;
+            rel1.offset: 0 3;
          }
       }
       part { name: "elm.swallow.left"; type: SWALLOW;
@@ -136,7 +144,7 @@ group { name: "elm/panes/horizontal/default";
       part { name: "elm.swallow.event"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
-            min: 16 6;
+            min: PANEMIN2 PANEMIN;
             fixed: 1 1;
             rel1.to: "elm.bar";
             rel2.to: "elm.bar";
@@ -145,7 +153,7 @@ group { name: "elm/panes/horizontal/default";
       part { name: "bar"; type: RECT;
          dragable.events: "elm.bar";
          description { state: "default" 0.0;
-            min: 32 6;
+            min: PANEWID PANEMIN;
             max: 99999 99999;
             fixed: 1 1;
             rel1.to_y: "elm.swallow.event";
@@ -168,14 +176,14 @@ group { name: "elm/panes/vertical/flush";
       }
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.left";
-            rel2.to: "elm.swallow.left";
+            rel2.to_x: "elm.bar";
+            rel2.relative: 1.0 1.0;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.right";
-            rel2.to: "elm.swallow.right";
+            rel1.to_x: "elm.bar";
+            rel1.relative: 0.0 0.0;
          }
       }
       part { name: "elm.swallow.left"; type: SWALLOW;
@@ -208,7 +216,7 @@ group { name: "elm/panes/vertical/flush";
       part { name: "elm.swallow.event"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
-            min: 6 16;
+            min: PANEMIN PANEMIN2;
             fixed: 1 1;
             rel1.to: "elm.bar";
             rel2.to: "elm.bar";
@@ -217,7 +225,7 @@ group { name: "elm/panes/vertical/flush";
       part { name: "bar"; type: RECT;
          dragable.events: "elm.bar";
          description { state: "default" 0.0;
-            min: 6 32;
+            min: PANEMIN PANEWID;
             max: 99999 99999;
             fixed: 1 1;
             rel1.to_x: "elm.swallow.event";
@@ -342,14 +350,14 @@ group { name: "elm/panes/horizontal/flush";
       }
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.left";
-            rel2.to: "elm.swallow.left";
+            rel2.to_y: "elm.bar";
+            rel2.relative: 1.0 1.0;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.right";
-            rel2.to: "elm.swallow.right";
+            rel1.to_y: "elm.bar";
+            rel1.relative: 0.0 0.0;
          }
       }
       part { name: "elm.swallow.left"; type: SWALLOW;
@@ -382,7 +390,7 @@ group { name: "elm/panes/horizontal/flush";
       part { name: "elm.swallow.event"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
-            min: 16 6;
+            min: PANEMIN2 PANEMIN;
             fixed: 1 1;
             rel1.to: "elm.bar";
             rel2.to: "elm.bar";
@@ -391,13 +399,13 @@ group { name: "elm/panes/horizontal/flush";
       part { name: "bar"; type: RECT;
          dragable.events: "elm.bar";
          description { state: "default" 0.0;
-            min: 32 6;
+            min: PANEWID PANEMIN;
             max: 99999 99999;
             fixed: 1 1;
             rel1.to_y: "elm.swallow.event";
             rel1.relative: 0.25 0.0;
             rel2.to_y: "elm.swallow.event";
-            rel2.relative: 0.75 0.0;
+            rel2.relative: 0.75 1.0;
             color: 0 0 0 0;
          }
       }

-- 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev

Reply via email to