hg merge release-1.0c (forward-porting)
This commit is contained in:
commit
6e7646db5c
|
@ -284,6 +284,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
|
||||||
contextHelp.setSclass("window-container-toolbar-btn context-help-btn");
|
contextHelp.setSclass("window-container-toolbar-btn context-help-btn");
|
||||||
contextHelp.setStyle("cursor: pointer; border: 1px solid transparent; padding: 2px;");
|
contextHelp.setStyle("cursor: pointer; border: 1px solid transparent; padding: 2px;");
|
||||||
contextHelp.setTooltiptext(Util.cleanAmp(Msg.getElement(Env.getCtx(), "AD_CtxHelp_ID")));
|
contextHelp.setTooltiptext(Util.cleanAmp(Msg.getElement(Env.getCtx(), "AD_CtxHelp_ID")));
|
||||||
|
contextHelp.setVisible(!e.isVisible());
|
||||||
|
|
||||||
return layout;
|
return layout;
|
||||||
}
|
}
|
||||||
|
@ -341,6 +342,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
|
||||||
layout.getEast().setVisible(true);
|
layout.getEast().setVisible(true);
|
||||||
layout.getEast().setOpen(true);
|
layout.getEast().setOpen(true);
|
||||||
contextHelp.setVisible(false);
|
contextHelp.setVisible(false);
|
||||||
|
updateHelpCollapsedPreference(false);
|
||||||
}
|
}
|
||||||
else if(comp instanceof ToolBarButton)
|
else if(comp instanceof ToolBarButton)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue