IDEMPIERE-181 Zk6: Fixed toolbar appearance

This commit is contained in:
Elaine Tan 2012-03-19 17:57:52 +08:00
parent 536955c281
commit 3e652da6a6
3 changed files with 7 additions and 15 deletions

View File

@ -36,6 +36,9 @@ public class ToolBarButton extends org.zkoss.zul.Toolbarbutton
@Override @Override
public void setDisabled(boolean disabled) { public void setDisabled(boolean disabled) {
if (disabled && isChecked())
setChecked(false); // uncheck when button is disabled
super.setDisabled(disabled); super.setDisabled(disabled);
if (disabled) { if (disabled) {
LayoutUtils.addSclass("disableFilter", this); LayoutUtils.addSclass("disableFilter", this);
@ -51,16 +54,9 @@ public class ToolBarButton extends org.zkoss.zul.Toolbarbutton
if (!getMode().equals("toggle")) if (!getMode().equals("toggle"))
setMode("toggle"); setMode("toggle");
if (!isDisabled()) { if (!isDisabled())
// if (pressed) {
// LayoutUtils.addSclass("depressed", this);
// } else {
// if (this.getSclass() != null && this.getSclass().indexOf("depressed") >= 0)
// this.setSclass(this.getSclass().replace("depressed", ""));
// }
setChecked(pressed); setChecked(pressed);
} }
}
// Elaine 2008/12/09 // Elaine 2008/12/09
public boolean isPressed() public boolean isPressed()

View File

@ -1288,12 +1288,11 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
} }
if (canHaveAttachment) if (canHaveAttachment)
{ {
toolbar.getButton("Attachment").setPressed(curTab.hasAttachment());
toolbar.enableAttachment(true); toolbar.enableAttachment(true);
toolbar.getButton("Attachment").setPressed(curTab.hasAttachment());
} }
else else
{ {
toolbar.getButton("Attachment").setPressed(false);
toolbar.enableAttachment(false); toolbar.enableAttachment(false);
} }
@ -1505,7 +1504,7 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
else else
{ {
curTab.dataIgnore(); curTab.dataIgnore();
curTab.dataRefresh(false); curTab.dataRefresh(true); // update statusbar & toolbar
curTabpanel.dynamicDisplay(0); curTabpanel.dynamicDisplay(0);
toolbar.enableIgnore(false); toolbar.enableIgnore(false);
} }

View File

@ -132,12 +132,9 @@ html,body {
} }
.depressed img { .depressed img {
/* border-style: inset;*/
border-width: 1px; border-width: 1px;
border-color: #9CBDFF; border-color: #9CBDFF;
background-color: #C4DCFB; background-color: #C4DCFB;
/* -moz-border-radius: 5px;
-webkit-border-radius: 5px;*/
padding: 0px 1px 0px 1px; padding: 0px 1px 0px 1px;
} }