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 e219a41..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,17 +611,17 @@ collections {
          }
       }
    }
-   group { name: "segment_test";
+      group { name: "segment_test";
       parts{
          part {
             name: "bg";
             type: RECT;
             scale: 1; //allow scaling
             description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 480 400;
-            color:  0 0 0 0;
+               state: "default" 0.0;
+               visible: 0;
+               visible: 0;
+               min: 480 400;
             }
          }
          part { name: "top_padding";
@@ -633,12 +633,11 @@ collections {
                min : 250 30; //minimum size for gap filler
                fixed: 0 1;
                rel1 {
-                  relative: 0.0 0.0;
+                  relative: 0 0;
                }
                rel2 {
-                  relative: 1.0 0.0;
+                  relative: 1 0;
                }
-               color:  0 0 0 0;
                align: 0 0;
             }
          }
@@ -678,7 +677,6 @@ collections {
                   relative: 1 1.0;
                   to_y: "segment1";
                }
-               color: 0 255 0 0;
             }
          }
          part { name: "segment2";
@@ -772,7 +770,10 @@ collections {
                   relative: 0.7 340/400;
                   to: "bg";
                }
+<<<<<<< HEAD
+=======
                align: 0.5 0.0;
+>>>>>>> remotes/origin/upstream
             }
          }
          part { name: "btn1_bottom_padding";
@@ -795,7 +796,7 @@ collections {
                }
             }
          }
-      }
+       }
    }
    group { name: "bg_overlay";
       images {
@@ -855,5 +856,29 @@ collections {
          }
       }
    }
+   group {
+      name: "test/layout";
+      images {
+         image: "sky.jpg" LOSSY 80;
+      }
+      parts {
+            part {
+                 name: "bg";
+                 description {
+                     state: "default" 0.0;
+                     color: 255 255 255 100;
+                     image.normal: "sky.jpg";
+                 }
+            }
+            part {
+                 name: "swallow";
+                 type: SWALLOW;
+                 description {
+                     state: "default" 0.0;
+                     rel1.offset: 8 8;
+                     rel2.offset: -7 -7;
+                 }
+            }
+      }
+   }
 }
-