Rejig the structure of windows a lot.

1 files changed, 66 insertions, 55 deletions

diff --git a/src/libraries/winFang.edc b/src/libraries/winFang.edc
index 6942aef..2b409ef 100644
--- a/src/libraries/winFang.edc
+++ b/src/libraries/winFang.edc
@@ -19,20 +19,13 @@ collections
     {
       part
       { name: "winFang/background";
-        type: IMAGE;
-        // Ignore mouse events.
-        mouse_events: 0;
-        // Each part has one or more descriptions, or states.
-        // They all have to have at least this default state.
+        type: SWALLOW;
+        mouse_events: 1;
+
         description
         { state: "default" 0.0;
-          // RGBA, so this is purple, and semi transparent.
-//        color: 50   0  100   100;  // pre multiplied  R = (r * a) / 255
-          color: 126  0  255   100;  //                 r = (R * 255) / a
-          aspect_preference: HORIZONTAL;
-          image{normal: "sky_04.jpg";}
         }
-      }
+      } // winFang/background
 
       part
       { name: "winFang/underlay";
@@ -41,16 +34,6 @@ collections
 
         description
         { state: "default" 0.0;
-          rel1
-          {
-            relative: 0.0 0.0;
-            to: "winFang/background";
-          }
-          rel2
-          {
-            relative: 1.0 1.0;
-            to: "winFang/background";
-          }
         }
       } // winFang/underlay
 
@@ -61,14 +44,7 @@ collections
 
         description
         { state: "default" 0.0;
-          fixed: 0 1;
-          visible: 0;
-        }
-
-        description
-        { state: "internal" 0.0;
-          inherit: "default" 0;
-          visible: 1;
+          fixed: 1 0;
           rel1
           {
             relative: 0.0 0.0;
@@ -77,59 +53,87 @@ collections
           rel2
           {
             relative: 1.0 0.0;
+            offset: 0 20;
+            to: "winFang/background";
+          }
+        }
+        description
+        { state: "main" 0.0;
+          inherit: "default";
+          visible: 0;
+          rel2
+          {
+            relative: 1.0 0.0;
+            offset: 0 0;
             to: "winFang/background";
-            offset: 0 15;
           }
         }
       }
 
       part
-      { name: "winFang/box";
-        type: BOX;
+      { name: "winFang/toolbar";
+        type: SWALLOW;
         mouse_events: 1;
 
         description
-        {
-          state: "default" 0.0;
-          fixed: 0 0;
-          box{layout: "vertical";}
+        { state: "default" 0.0;
+          fixed: 1 0;
+          visible: 0;
           rel1
           {
-             relative: 0.0 0.0;
-            to: "winFang/background";
+            relative: 0.0 1.0;
+            to: "winFang/title";
           }
           rel2
           {
             relative: 1.0 1.0;
-            to: "winFang/background";
+            offset: 0 0;
+            to: "winFang/title";
+          }
+        }
+        description
+        { state: "toolbar" 0.0;
+          inherit: "default";
+          visible: 1;
+          rel2
+          {
+            relative: 1.0 1.0;
+            offset: 0 50;
+            to: "winFang/title";
           }
         }
+      }
+
+      part
+      { name: "winFang/box";
+        type: SWALLOW;
+        mouse_events: 1;
 
         description
-        { state: "internal" 0.0;
-          inherit: "default" 0;
+        {
+          state: "default" 0.0;
+          fixed: 0 1;
           rel1
           {
-             relative: 0.0 0.0;
-            to: "winFang/title";
-                offset: 0 15;
+             relative: 0.0 1.0;
+            to: "winFang/toolbar";
           }
           rel2
           {
-            relative: 1.0 1.0;
+             relative: 1.0 1.0;
             to: "winFang/background";
           }
         }
       } // winFang/box
 
       part
-      { name: "winFang/content";
+      { name: "winFang/grid";
         type: SWALLOW;
         mouse_events: 1;
 
         description
         { state: "default" 0.0;
-          fixed: 0 0;
+          fixed: 0 1;
           rel1
           {
             relative: 0.0 0.0;
@@ -141,20 +145,27 @@ collections
             to: "winFang/box";
           }
         }
-      } // winFang/content
+      } // winFang/grid
 
       programs
       {
         program
-        { name: "isInternal";
-          signal: "isInternal";
-          source: "isInternal";
-          action: STATE_SET "internal" 0.0;
+        { name: "isToolbar";
+          signal: "isToolbar";
+          source: "isToolbar";
+          action: STATE_SET "toolbar" 0.0;
+          target: "winFang/toolbar";
+        }
+
+        program
+        { name: "isMain";
+          signal: "isMain";
+          source: "isMain";
+          action: STATE_SET "main" 0.0;
           target: "winFang/title";
-          target: "winFang/box";
-        }
+        }
       }
-
     }
   }
 }
+