From 647f4c1e12114a1a87e13fb9129527e2c62440b2 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Mon, 8 Oct 2007 06:50:38 +0000 Subject: [PATCH] enhancements for splitpanel svn changeset:2448/svn branch:trunk --- .../terminal/gwt/client/ui/ISplitPanel.java | 22 ++++++++++++++----- .../public/default/splitpanel/splitpanel.css | 12 +++++++--- 2 files changed, 25 insertions(+), 9 deletions(-) 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 575cb9abfa..f9fa6d3a06 100644 --- 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 8d8d498d2f..8453872de0 100644 --- 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 +} + -- 2.39.5