diff options
author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2007-07-12 11:28:49 +0000 |
---|---|---|
committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2007-07-12 11:28:49 +0000 |
commit | 843c09cf7f009041d0467ceeb05541936f05576f (patch) | |
tree | 2e88cadd5c070b9faf97ee76b60817918f999d6c | |
parent | f3eb3594a9ab7833a9d90595721cce96417cf5b9 (diff) | |
download | vaadin-framework-843c09cf7f009041d0467ceeb05541936f05576f.tar.gz vaadin-framework-843c09cf7f009041d0467ceeb05541936f05576f.zip |
fixed column ordering in IE
svn changeset:1848/svn branch:trunk
-rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java index 97476791c0..c6a1fc916c 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java @@ -635,6 +635,8 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll DOM.appendChild(td, captionContainer); + DOM.sinkEvents(td, Event.MOUSEEVENTS); + setElement(td); } @@ -670,14 +672,11 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll * Handle column reordering. */ public void onBrowserEvent(Event event) { - if(isResizing || DOM.compare(DOM.eventGetTarget(event), colResizeWidget)) { onResizeEvent(event); } else { handleCaptionEvent(event); } - - super.onBrowserEvent(event); } @@ -712,16 +711,17 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll private void handleCaptionEvent(Event event) { switch (DOM.eventGetType(event)) { case Event.ONMOUSEDOWN: + client.console.log("HeaderCaption: mouse down"); dragging = true; moved = false; colIndex = getColIndexByKey(cid); DOM.setCapture(getElement()); - this.headerX = tHead.getAbsoluteLeft(); - + client.console.log("HeaderCaption: Caption set to capture mouse events"); DOM.eventPreventDefault(event); break; case Event.ONMOUSEUP: + client.console.log("HeaderCaption: mouseUP"); dragging = false; DOM.releaseCapture(getElement()); @@ -744,7 +744,7 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll } break; } - System.out.println("Stopped column reordering"); + client.console.log("HeaderCaption: Stopped column reordering"); hideFloatingCopy(); tHead.removeSlotFocus(); if(closestSlot != colIndex && closestSlot != (colIndex + 1) ) { @@ -756,7 +756,7 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll break; case Event.ONMOUSEMOVE: if (dragging) { - System.out.print("Dragging column, optimal index..."); + client.console.log("HeaderCaption: Dragging column, optimal index..."); if(!moved) { createFloatingCopy(); moved = true; @@ -784,7 +784,7 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll tHead.focusSlot(closestSlot); updateFloatingCopysPosition(x, -1); - System.out.println(closestSlot); + client.console.log(""+closestSlot); } break; default: |