Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / data / objects / test.edc

diff --git a/data/objects/test.edc b/data/objects/test.edc
index 8efdca8..3bfeccc 100644 (file)
--- a/data/objects/test.edc
+++ b/data/objects/test.edc
@@ -13,7 +13,7 @@ collections {
             }
          }
         part { name: "sky";
-            mouse_events: 0;
+            mouse_events: 1;
             clip_to: "clip";
            description { state: "default" 0.0;
               aspect: 2.6225 2.6225;
@@ -611,6 +611,193 @@ collections {
          }
       }
    }
+      group { name: "segment_test";
+      parts{
+         part {
+            name: "bg";
+            type: RECT;
+            scale: 1; //allow scaling
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               visible: 0;
+               min: 480 400;
+            }
+         }
+         part { name: "top_padding";
+            type: RECT;
+            scale: 1; //allow scaling
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min : 250 30; //minimum size for gap filler
+               fixed: 0 1;
+               rel1 {
+                  relative: 0 0;
+               }
+               rel2 {
+                  relative: 1 0;
+               }
+               align: 0 0;
+            }
+         }
+         part { name: "segment1";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "bg";
+                  to_y: "top_padding";
+               }
+               rel2 {
+                  relative: 1.0 0.25;
+                  to: "bg";
+               }
+               align: 0.5 0.0;
+            }
+         }
+         part { name: "segment1_bottom_padding";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min : 250 10;
+               max : 250 10;
+               fixed: 1 1;
+               align: 0.5 0;
+               rel1 {
+                  relative: 0 1.0;
+                  to_y: "segment1";
+               }
+               rel2 {
+                  relative: 1 1.0;
+                  to_y: "segment1";
+               }
+            }
+         }
+         part { name: "segment2";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.1 1.0;
+                  to_x: "bg";
+                  to_y: "segment1_bottom_padding";
+               }
+               rel2 {
+                  relative: 0.9 160/400;
+                  to: "bg";
+               }
+               align: 0.5 0.0;
+            }
+         }
+         part { name: "segment2_bottom_padding";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min : 250 10;
+               max : 250 10;
+               fixed: 1 1;
+               align: 0.5 0;
+               rel1 {
+                  relative: 0 1.0;
+                  to_y: "segment2";
+               }
+               rel2 {
+                  relative: 1 1.0;
+                  to_y: "segment2";
+               }
+            }
+         }
+         part { name: "segment3";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.2 1.0;
+                  to_x: "bg";
+                  to_y: "segment2_bottom_padding";
+               }
+               rel2 {
+                  relative: 0.8 0.6;
+                  to: "bg";
+               }
+               align: 0.5 0.0;
+            }
+         }
+         part { name: "segment3_bottom_padding";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min : 250 10;
+               max : 250 10;
+               fixed: 1 1;
+               align: 0.5 0;
+               rel1 {
+                  relative: 0 1.0;
+                  to_y: "segment3";
+               }
+               rel2 {
+                  relative: 1 1.0;
+                  to_y: "segment3";
+               }
+            }
+         }
+         part { name: "segment4";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.3 1.0;
+                  to_x: "bg";
+                  to_y: "segment3_bottom_padding";
+               }
+               rel2 {
+                  relative: 0.7 340/400;
+                  to: "bg";
+               }
+<<<<<<< HEAD
+=======
+               align: 0.5 0.0;
+>>>>>>> remotes/origin/upstream
+            }
+         }
+         part { name: "btn1_bottom_padding";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min : 250 100;
+               max : 250 100;
+               fixed: 1 1;
+               align: 0.5 0;
+               rel1 {
+                  relative: 0 1.0;
+                  to_y: "segment4";
+               }
+               rel2 {
+                  relative: 1 1.0;
+                  to_y: "segment4";
+               }
+            }
+         }
+       }
+   }
    group { name: "bg_overlay";
       images {
         image: "clo.png" LOSSY 60;
@@ -669,10 +856,10 @@ collections {
          }
       }
    }
-group {
+   group {
       name: "test/layout";
       images {
-        image: "sky.jpg" LOSSY 80;
+         image: "sky.jpg" LOSSY 80;
       }
       parts {
             part {
@@ -693,6 +880,5 @@ group {
                  }
             }
       }
+   }
 }
-}
-