#6041 The splitter in a disabled split panel can be moved

svn changeset:16591/svn branch:6.5

diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
index fd92984abb910175d2adcbd4e00ee0be6f6443f3..80a2133b2329be77f58d960540d260dfd13b3f3d 100644 (file)
--- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
@@ -16,6 +16,9 @@
        cursor: e-resize;
        cursor: col-resize;
 }
+.v-disabled .v-splitpanel-hsplitter div {
+       cursor: default;
+}
 .v-splitpanel-vsplitter {
        height: 6px;
        font-size: 1px; /* for IE6 */
@@ -27,6 +30,9 @@
        cursor: s-resize;
        cursor: row-resize;
 }
+.v-disabled .v-splitpanel-vsplitter div {
+       cursor: default;
+}
 /* IE specific styles */
 .v-ie6 .v-splitpanel-hsplitter div {
        height: 99%;

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index b1a60ab1373abbfd9a647f965ace249e41815c66..c87072423346acb0a5e05579398bd126f6d418bb 100644 (file)
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_0_dev-20101216";}
-.v-theme-version-6_5_0_dev-20101216 {display: none;}
+.v-theme-version:after {content:"6_5_0_dev-20101221";}
+.v-theme-version-6_5_0_dev-20101221 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1422,6 +1422,9 @@ div.v-progressindicator-indeterminate-disabled {
        cursor: e-resize;
        cursor: col-resize;
 }
+.v-disabled .v-splitpanel-hsplitter div {
+       cursor: default;
+}
 .v-splitpanel-vsplitter {
        height: 6px;
        font-size: 1px; /* for IE6 */
@@ -1433,6 +1436,9 @@ div.v-progressindicator-indeterminate-disabled {
        cursor: s-resize;
        cursor: row-resize;
 }
+.v-disabled .v-splitpanel-vsplitter div {
+       cursor: default;
+}
 /* IE specific styles */
 .v-ie6 .v-splitpanel-hsplitter div {
        height: 99%;

diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index 01300df64652384528ebf2f5e37ec7320d6edec3..6beec279c02ab8cf54924b8f7af588a9272fbe1d 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_0_dev-20101216";}
-.v-theme-version-6_5_0_dev-20101216 {display: none;}
+.v-theme-version:after {content:"6_5_0_dev-20101221";}
+.v-theme-version-6_5_0_dev-20101221 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1422,6 +1422,9 @@ div.v-progressindicator-indeterminate-disabled {
        cursor: e-resize;
        cursor: col-resize;
 }
+.v-disabled .v-splitpanel-hsplitter div {
+       cursor: default;
+}
 .v-splitpanel-vsplitter {
        height: 6px;
        font-size: 1px; /* for IE6 */
@@ -1433,6 +1436,9 @@ div.v-progressindicator-indeterminate-disabled {
        cursor: s-resize;
        cursor: row-resize;
 }
+.v-disabled .v-splitpanel-vsplitter div {
+       cursor: default;
+}
 /* IE specific styles */
 .v-ie6 .v-splitpanel-hsplitter div {
        height: 99%;

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index b8b90f9fa0c3d2e6d2451850d8b371ee07aa46b8..8407d0a8ecbb9254d110b7f608606925aa672c34 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_0_dev-20101216";}
-.v-theme-version-6_5_0_dev-20101216 {display: none;}
+.v-theme-version:after {content:"6_5_0_dev-20101221";}
+.v-theme-version-6_5_0_dev-20101221 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1422,6 +1422,9 @@ div.v-progressindicator-indeterminate-disabled {
        cursor: e-resize;
        cursor: col-resize;
 }
+.v-disabled .v-splitpanel-hsplitter div {
+       cursor: default;
+}
 .v-splitpanel-vsplitter {
        height: 6px;
        font-size: 1px; /* for IE6 */
@@ -1433,6 +1436,9 @@ div.v-progressindicator-indeterminate-disabled {
        cursor: s-resize;
        cursor: row-resize;
 }
+.v-disabled .v-splitpanel-vsplitter div {
+       cursor: default;
+}
 /* IE specific styles */
 .v-ie6 .v-splitpanel-hsplitter div {
        height: 99%;

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 289ee91b9b96f01bfde9cdb515f82e102c6a911b..b9580f9248bd2db0bc13ff8a744f3459eb5ab0bd 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_0_dev-20101216";}
-.v-theme-version-6_5_0_dev-20101216 {display: none;}
+.v-theme-version:after {content:"6_5_0_dev-20101221";}
+.v-theme-version-6_5_0_dev-20101221 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1422,6 +1422,9 @@ div.v-progressindicator-indeterminate-disabled {
        cursor: e-resize;
        cursor: col-resize;
 }
+.v-disabled .v-splitpanel-hsplitter div {
+       cursor: default;
+}
 .v-splitpanel-vsplitter {
        height: 6px;
        font-size: 1px; /* for IE6 */
@@ -1433,6 +1436,9 @@ div.v-progressindicator-indeterminate-disabled {
        cursor: s-resize;
        cursor: row-resize;
 }
+.v-disabled .v-splitpanel-vsplitter div {
+       cursor: default;
+}
 /* IE specific styles */
 .v-ie6 .v-splitpanel-hsplitter div {
        height: 99%;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java
index 33c13f674237be9d33635b2fc6fb9b7944b0378f..a9ab63aa77a2041288d37859e4433deb4bfbf4a5 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java
@@ -29,6 +29,9 @@ import com.vaadin.terminal.gwt.client.Util;
 
 public class VSplitPanel extends ComplexPanel implements Container,
         ContainerResizedListener {
+
+    private boolean enabled = false;
+
     public static final String CLASSNAME = "v-splitpanel";
 
     public static final String SPLITTER_CLICK_EVENT_IDENTIFIER = "sp_click";
@@ -207,6 +210,7 @@ public class VSplitPanel extends ComplexPanel implements Container,
             rendering = false;
             return;
         }
+        setEnabled(!uidl.getBooleanAttribute("disabled"));
 
         clickEventHandler.handleEventHandlerRegistration(client);
         if (uidl.hasAttribute("style")) {
@@ -459,7 +463,7 @@ public class VSplitPanel extends ComplexPanel implements Container,
     }
 
     public void onMouseDown(Event event) {
-        if (locked) {
+        if (locked || !isEnabled()) {
             return;
         }
         final Element trg = DOM.eventGetTarget(event);
@@ -548,7 +552,7 @@ public class VSplitPanel extends ComplexPanel implements Container,
                 pos = getOffsetHeight();
             }
             // Reversed position
-            if(positionReversed){
+            if (positionReversed) {
                 pos = getOffsetHeight() - pos - getSplitterSize();
             }
             position = pos / getOffsetHeight() * 100 + "%";
@@ -763,4 +767,12 @@ public class VSplitPanel extends ComplexPanel implements Container,
         DOM.setElementProperty(firstContainer, "className", firstStyle);
         DOM.setElementProperty(secondContainer, "className", secondStyle);
     }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
 }