From 494fdca8cef23697f73c2703d0149fb95d482921 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 6 Mar 2013 11:38:01 +0800 Subject: [PATCH] IDEMPIERE-688 Zk: Current row highlight lost after moving back from child to parent. --- .../webui/adwindow/CompositeADTabbox.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java index ebc946b3cf..d103b72663 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java @@ -45,6 +45,8 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Menuitem; +import org.zkoss.zul.Row; +import org.zkoss.zul.RowRenderer; import org.zkoss.zul.Vlayout; /** @@ -210,7 +212,7 @@ public class CompositeADTabbox extends AbstractADTabbox layout.addEventListener(ON_POST_TAB_SELECTION_CHANGED_EVENT, new EventListener() { @Override public void onEvent(Event event) throws Exception { - onPostTabSelectionChanged(); + onPostTabSelectionChanged((Boolean)event.getData()); } }); @@ -435,10 +437,10 @@ public class CompositeADTabbox extends AbstractADTabbox headerTab.setDetailPaneMode(false); getBreadCrumb().getFirstChild().setVisible(false); - Events.echoEvent(new Event(ON_POST_TAB_SELECTION_CHANGED_EVENT, layout)); + Events.echoEvent(new Event(ON_POST_TAB_SELECTION_CHANGED_EVENT, layout, oldIndex > newIndex)); } - private void onPostTabSelectionChanged() { + private void onPostTabSelectionChanged(Boolean back) { if (headerTab instanceof ADTabpanel) { DetailPane detailPane = headerTab.getDetailPane(); if (detailPane == null) { @@ -488,6 +490,17 @@ public class CompositeADTabbox extends AbstractADTabbox adwindow.getADWindowContent().getToolbar().enableTabNavigation(getBreadCrumb().hasParentLink(), headerTab.getDetailPane() != null && headerTab.getDetailPane().getTabcount() > 0); } + + //indicator and row highlight lost after navigate back from child to parent + if (back != null && back.booleanValue()) { + if (headerTab.isGridView()) { + RowRenderer renderer = headerTab.getGridView().getListbox().getRowRenderer(); + GridTabRowRenderer gtr = (GridTabRowRenderer)renderer; + Row row = gtr.getCurrentRow(); + if (row != null) + gtr.setCurrentRow(row); + } + } } private void updateBreadCrumb() {