From 3741f466dacc6f9f523f4f4782fd613a8bf900b0 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 16 Jul 2017 18:44:46 +0700
Subject: [PATCH] IDEMPIERE-3426:improve tab behavior

drag&drop for home tab case
---
 .../src/org/adempiere/webui/desktop/DefaultDesktop.java       | 1 +
 .../WEB-INF/src/org/adempiere/webui/part/WindowContainer.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
index 98cb2cec18..f95a277ba5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
@@ -300,6 +300,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
         homeTab = new Tabpanel();
         windowContainer.addWindow(homeTab, Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Home")), false, null);
         homeTab.getLinkedTab().setSclass("desktop-hometab");
+        ((Tab)homeTab.getLinkedTab()).setDisableDraggDrop(true);
         homeTab.setSclass("desktop-home-tabpanel");
         BusyDialog busyDialog = new BusyDialog();
         busyDialog.setShadow(false);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
index 01bb179aba..31be322d96 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
@@ -450,11 +450,11 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
 			} catch (Exception e) {}
 		}else if (Events.ON_CTRL_KEY.equals(event.getName())) {
 			KeyEvent keyEvent = (KeyEvent) event;
-			if (keyEvent.isAltKey() && keyEvent.getKeyCode() == KeyEvent.PAGE_UP
+			if (keyEvent.isAltKey() && keyEvent.getKeyCode() == KeyEvent.PAGE_DOWN
 					&& tabbox.getSelectedTab() != null && tabbox.getSelectedTab().getNextSibling() != null) {
 				tabbox.setSelectedTab((org.zkoss.zul.Tab)tabbox.getSelectedTab().getNextSibling());
 				keyEvent.stopPropagation();
-			}else if (keyEvent.isAltKey() && keyEvent.getKeyCode() == KeyEvent.PAGE_DOWN
+			}else if (keyEvent.isAltKey() && keyEvent.getKeyCode() == KeyEvent.PAGE_UP
 					&& tabbox.getSelectedTab() != null && tabbox.getSelectedTab().getPreviousSibling() != null) {
 				tabbox.setSelectedTab((org.zkoss.zul.Tab)tabbox.getSelectedTab().getPreviousSibling());
 				keyEvent.stopPropagation();