1 files changed, 120 insertions, 0 deletions
diff --git a/swat/apps/qooxdoo-examples/test/GridLayout_9.html b/swat/apps/qooxdoo-examples/test/GridLayout_9.html
new file mode 100644
index 0000000000..1e575c8903
--- /dev/null
+++ b/swat/apps/qooxdoo-examples/test/GridLayout_9.html
@@ -0,0 +1,120 @@
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>qooxdoo &raquo; Demo</title>
+  <link type="text/css" rel="stylesheet" href="../../resource/css/layout.css"/>
+  <!--[if IE]>
+  <link type="text/css" rel="stylesheet" href="../../resource/css/layout_ie.css"/>
+  <![endif]-->
+  <script type="text/javascript" src="../../script/qx.js"></script>
+</head>
+<body>
+  <script type="text/javascript" src="../../script/layout.js"></script>
+
+  <div id="demoDescription">
+    <p>Test for qx.ui.layout.GridLayout. Now with cells which are merged with others.</p>
+    <p>Added spacing in combination with spans.</p>
+    <p>Added padding in combination with spans.</p>
+  </div>
+
+  <script type="text/javascript">
+  qx.core.Init.getInstance().defineMain(function()
+  {
+    var gl = new qx.ui.layout.GridLayout;
+    
+    gl.setLocation(20, 48);
+    gl.setDimension("auto", "auto");
+    gl.setBorder(qx.renderer.border.BorderPresets.getInstance().outset);
+    gl.setPadding(2, 4);
+    gl.setColumnCount(4);
+    gl.setRowCount(2);
+    gl.setHorizontalSpacing(10);
+    gl.setVerticalSpacing(10);
+    gl.setCellPaddingTop(4);
+    gl.setCellPaddingRight(4);
+    gl.setCellPaddingBottom(4);
+    gl.setCellPaddingLeft(4);
+    
+    gl.setColumnWidth(0, 100);
+    gl.setColumnWidth(1, 200);
+    gl.setColumnWidth(2, 50);
+    gl.setColumnWidth(3, 100);
+    
+    gl.setRowHeight(0, 40);
+    gl.setRowHeight(1, 80);
+    
+    qx.ui.core.ClientDocument.getInstance().add(gl);
+    
+    // start-col, start-row, col-length, row-length
+    gl.debug("Merge: 1, 1, 2, 1");
+    gl.mergeCells(1, 1, 2, 1);   
+    
+    gl.debug("Span-Start (0, 1): " + gl.isSpanStart(0, 1));
+    gl.debug("Span-Start (0, 2): " + gl.isSpanStart(0, 2));
+    gl.debug("Span-Start (1, 1): " + gl.isSpanStart(1, 1));
+    gl.debug("Span-Start (1, 2): " + gl.isSpanStart(1, 2));
+    gl.debug("Span-Start (2, 1): " + gl.isSpanStart(2, 1));
+    gl.debug("Span-Start (2, 2): " + gl.isSpanStart(2, 2));
+    gl.debug("Span-Start (3, 1): " + gl.isSpanStart(3, 1));
+    gl.debug("Span-Start (3, 2): " + gl.isSpanStart(3, 2));
+    
+    gl.debug("Span-Cell (0, 1): " + gl.isSpanCell(0, 1));
+    gl.debug("Span-Cell (0, 2): " + gl.isSpanCell(0, 2));
+    gl.debug("Span-Cell (1, 1): " + gl.isSpanCell(1, 1));
+    gl.debug("Span-Cell (1, 2): " + gl.isSpanCell(1, 2));
+    gl.debug("Span-Cell (2, 1): " + gl.isSpanCell(2, 1));
+    gl.debug("Span-Cell (2, 2): " + gl.isSpanCell(2, 2));
+    gl.debug("Span-Cell (3, 1): " + gl.isSpanCell(3, 1));
+    gl.debug("Span-Cell (3, 2): " + gl.isSpanCell(3, 2));
+
+    gl.debug("Fill-Cell (0, 1): " + gl.isFillCell(0, 1));
+    gl.debug("Fill-Cell (0, 2): " + gl.isFillCell(0, 2));
+    gl.debug("Fill-Cell (1, 1): " + gl.isFillCell(1, 1));
+    gl.debug("Fill-Cell (1, 2): " + gl.isFillCell(1, 2));
+    gl.debug("Fill-Cell (2, 1): " + gl.isFillCell(2, 1));
+    gl.debug("Fill-Cell (2, 2): " + gl.isFillCell(2, 2));
+    gl.debug("Fill-Cell (3, 1): " + gl.isFillCell(3, 1));
+    gl.debug("Fill-Cell (3, 2): " + gl.isFillCell(3, 2));
+    
+    /*
+    // both should be impossible
+    gl.debug("Merge 1, 1, 2, 1");
+    gl.mergeCells(1, 1, 2, 1);
+
+    gl.debug("Merge 0, 0, 3, 4");
+    gl.mergeCells(0, 0, 3, 4);
+    */
+    
+    gl.debug("Merge 0, 0, 1, 2");
+    gl.mergeCells(0, 0, 1, 2);
+    
+    gl.debug("Merge 2, 0, 2, 1");
+    gl.mergeCells(2, 0, 2, 1);
+    
+    
+    
+    
+    var term1 = new qx.ui.basic.Terminator;
+    term1.setBackgroundColor("yellow");
+    gl.add(term1, 0, 0);
+    
+    var term2 = new qx.ui.basic.Terminator;
+    term2.setBackgroundColor("red");
+    gl.add(term2, 1, 0);
+    
+    var term3 = new qx.ui.basic.Terminator;
+    term3.setBackgroundColor("green");
+    gl.add(term3, 2, 0);
+
+    var term6 = new qx.ui.basic.Terminator;
+    term6.setBackgroundColor("olive");
+    gl.add(term6, 1, 1);    
+  
+    var term8 = new qx.ui.basic.Terminator;
+    term8.setBackgroundColor("navy");
+    gl.add(term8, 3, 1);            
+  });
+  </script> 
+
+</body>
+</html>