enhancements for splitpanel

svn changeset:2448/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
index 575cb9abfad1c467a63529dadc65661e73f3b17b..f9fa6d3a067f0b0d4570bd689ea8f949ecb2be4d 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
@@ -148,11 +148,15 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
                
                switch (orientation) {
                case ORIENTATION_HORIZONTAL:
-                       wholeSize = DOM.getElementPropertyInt(wrapper, "offsetWidth");
+                       wholeSize = DOM.getElementPropertyInt(wrapper, "clientWidth");
                        pixelPosition = DOM.getElementPropertyInt(splitter, "offsetLeft");
 
-                       ApplicationConnection.getConsole().log(wholeSize+"");
-                       ApplicationConnection.getConsole().log(pixelPosition+"");
+                       // reposition splitter in case it is out of box
+                       if(pixelPosition + SPLITTER_SIZE > wholeSize) {
+                               pixelPosition = wholeSize - SPLITTER_SIZE;
+                               setSplitPosition(pixelPosition + "px");
+                               return;
+                       }
 
                        DOM
                                        .setStyleAttribute(firstContainer, "width", pixelPosition
@@ -169,9 +173,13 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
                case ORIENTATION_VERTICAL:
                        wholeSize = DOM.getElementPropertyInt(wrapper, "clientHeight");
                        pixelPosition = DOM.getElementPropertyInt(splitter, "offsetTop");
-
-                       ApplicationConnection.getConsole().log(wholeSize+"");
-                       ApplicationConnection.getConsole().log(pixelPosition+"");
+                       
+                       // reposition splitter in case it is out of box
+                       if(pixelPosition + SPLITTER_SIZE > wholeSize) {
+                               pixelPosition = wholeSize - SPLITTER_SIZE;
+                               setSplitPosition(pixelPosition + "px");
+                               return;
+                       }
 
                        DOM.setStyleAttribute(firstContainer, "height", pixelPosition
                                        + "px");
@@ -183,6 +191,8 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
                        DOM.setStyleAttribute(secondContainer, "top",
                                        (pixelPosition + SPLITTER_SIZE) + "px");
                default:
+                       ApplicationConnection.getConsole().log("???");
+
 
                        break;
                }

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css
index 8d8d498d2f366bf61805db29c5f3b13153d9a2d3..8453872de00d3fadf2b9d1a05fc38bfc64b41f07 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css
@@ -1,13 +1,19 @@
-.i-splitpanel-horizontal .hsplitter {
+.i-splitpanel-horizontal .splitter,
+.i-splitpanel-vertical .i-splitpanel-horizontal .splitter {
        width: 8px;
        background: #ccd2d0 url(img/bg_hor.png);
        border: 1px solid #b6bbbc;
+       border-top:0;
+       border-bottom:0;
        cursor: e-resize;
 }
 
-.i-splitpanel-vertical .vsplitter {
+.i-splitpanel-vertical .splitter {
        height: 8px;
        background: #ccd2d0 url(img/bg_ver.png);
        border: 1px solid #b6bbbc;
+       border-left:0;
+       border-right:0;
        cursor: n-resize;
-}
\ No newline at end of file
+}
+