Lior Vernia has uploaded a new change for review. Change subject: webadmin: Allowed non-draggable NetworkItemPanel ......................................................................
webadmin: Allowed non-draggable NetworkItemPanel It seems that so far setting draggable to false did nothing, the item would still be draggable; for some reason calling setDraggable(Element.DRAGGABLE_FALSE) adds the draggable property to an element and sets it to true! Added some code to disable the "draggable skin" and the actual drag operation when an item has been constructed as non-draggable. Also, changed bonds to be draggable explicitly, as they have been draggable all this time and I've heard no complaints. Change-Id: I0f130803ce2403cc26297ec8d06ef62d23837b96 Bug-Url: https://bugzilla.redhat.com/990612 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java 2 files changed, 20 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/19821/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java index 60d83e3..014142b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java @@ -16,7 +16,7 @@ public class BondPanel extends NicPanel { public BondPanel(BondNetworkInterfaceModel item, NetworkPanelsStyle style) { - super(item, style, false); + super(item, style, true); actionButton.setStyleName(style.actionButtonBond()); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java index 979e9ad..26cd638 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java @@ -46,6 +46,7 @@ final PushButton actionButton; final NetworkItemModel<?> item; + final private boolean draggable; final protected NetworkPanelsStyle style; protected NetworkItemPanel parentPanel; private MenuBar menu; @@ -58,7 +59,7 @@ private static String lastDragData = ""; //$NON-NLS-1$ public NetworkItemPanel(NetworkItemModel<?> item, NetworkPanelsStyle style, boolean draggable) { - super(); + this.draggable = draggable; getElement().setDraggable(draggable ? Element.DRAGGABLE_TRUE : Element.DRAGGABLE_FALSE); dragImage.setVisible(false); @@ -108,7 +109,7 @@ } protected void onMouseOver() { - dragImage.setVisible(true); + dragImage.setVisible(draggable); infoPopup.showItem(item, this); } @@ -137,21 +138,23 @@ }, ContextMenuEvent.getType()); // drag start - addBitlessDomHandler(new DragStartHandler() { - @Override - public void onDragStart(DragStartEvent event) { - NetworkItemPanel sourcePanel = (NetworkItemPanel) event.getSource(); - // Required: set data for the event. - lastDragData = sourcePanel.item.getType() + " " + sourcePanel.item.getName(); //$NON-NLS-1$ - event.setData("Text", lastDragData); //$NON-NLS-1$ + if (draggable) { + addBitlessDomHandler(new DragStartHandler() { + @Override + public void onDragStart(DragStartEvent event) { + NetworkItemPanel sourcePanel = (NetworkItemPanel) event.getSource(); + // Required: set data for the event. + lastDragData = sourcePanel.item.getType() + " " + sourcePanel.item.getName(); //$NON-NLS-1$ + event.setData("Text", lastDragData); //$NON-NLS-1$ - // show a ghost of the widget under cursor. - NativeEvent nativeEvent = event.getNativeEvent(); - int x = nativeEvent.getClientX() - sourcePanel.getAbsoluteLeft(); - int y = nativeEvent.getClientY() - sourcePanel.getAbsoluteTop(); - event.getDataTransfer().setDragImage(sourcePanel.getElement(), x, y); - } - }, DragStartEvent.getType()); + // show a ghost of the widget under cursor. + NativeEvent nativeEvent = event.getNativeEvent(); + int x = nativeEvent.getClientX() - sourcePanel.getAbsoluteLeft(); + int y = nativeEvent.getClientY() - sourcePanel.getAbsoluteTop(); + event.getDataTransfer().setDragImage(sourcePanel.getElement(), x, y); + } + }, DragStartEvent.getType()); + } } -- To view, visit http://gerrit.ovirt.org/19821 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f130803ce2403cc26297ec8d06ef62d23837b96 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
