hg merge release-1.0c (forward-porting)

This commit is contained in:
Carlos Ruiz 2013-09-14 12:13:25 -05:00
commit 6e7646db5c
1 changed files with 2 additions and 0 deletions

View File

@ -284,6 +284,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
contextHelp.setSclass("window-container-toolbar-btn context-help-btn");
contextHelp.setStyle("cursor: pointer; border: 1px solid transparent; padding: 2px;");
contextHelp.setTooltiptext(Util.cleanAmp(Msg.getElement(Env.getCtx(), "AD_CtxHelp_ID")));
contextHelp.setVisible(!e.isVisible());
return layout;
}
@ -341,6 +342,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
layout.getEast().setVisible(true);
layout.getEast().setOpen(true);
contextHelp.setVisible(false);
updateHelpCollapsedPreference(false);
}
else if(comp instanceof ToolBarButton)
{