ui: do not ignore DialogStyle if DoNotAskOption is set but not visible

This commit is contained in:
Aleksey Pivovarov
2016-12-20 13:42:43 +03:00
committed by Aleksey Pivovarov
parent 348de83f1d
commit 2d190fbbf0
@@ -656,17 +656,11 @@ public abstract class DialogWrapper {
if (doNotAsk != null) {
myCheckBoxDoNotShowDialog = new JCheckBox(doNotAsk.getDoNotShowMessage());
JPanel southPanel = panel;
if (!doNotAsk.canBeHidden()) {
return southPanel;
if (doNotAsk.canBeHidden()) {
panel = addDoNotShowCheckBox(panel, myCheckBoxDoNotShowDialog);
myCheckBoxDoNotShowDialog.setSelected(!doNotAsk.isToBeShown());
DialogUtil.registerMnemonic(myCheckBoxDoNotShowDialog, '&');
}
final JPanel withCB = addDoNotShowCheckBox(southPanel, myCheckBoxDoNotShowDialog);
myCheckBoxDoNotShowDialog.setSelected(!doNotAsk.isToBeShown());
DialogUtil.registerMnemonic(myCheckBoxDoNotShowDialog, '&');
panel = withCB;
}
if (getStyle() == DialogStyle.COMPACT) {