Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

UI: fixed rare error with wrong dialog position after multiple popups (#4318);

Browse source
This commit is contained in:
Oleg Agafonov 2019-03-28 09:19:16 +04:00
parent 14f90bfc77
commit c58b28f94f
12 changed files with 185 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage.Client/src/main/java/mage/client/dialog/PickCheckBoxDialog.java
View file

@ -32,7 +32,7 @@ public class PickCheckBoxDialog extends MageDialog {
if (!(obj instanceof java.awt.Component)) {
throw new IllegalArgumentException("Must be a java.awt.Component!");
}
this.scrollList.setViewportView((java.awt.Component) obj);
this.scrollList.setViewportView(obj);
}
private javax.swing.JList get_a_Jlist_from_ScrollListView() {
@ -181,16 +181,14 @@ public class PickCheckBoxDialog extends MageDialog {
}
// window settings
MageFrame.getDesktop().remove(this);
if (this.isModal()) {
MageFrame.getDesktop().add(this, JLayeredPane.MODAL_LAYER);
} else {
MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
}
if (mageDialogState != null) {
mageDialogState.setStateToDialog(this);
} else {
this.makeWindowCentered();
}
if (mageDialogState != null) mageDialogState.setStateToDialog(this);
else this.makeWindowCentered();
// final load
loadData();
@ -366,7 +364,7 @@ public class PickCheckBoxDialog extends MageDialog {
}
public Object getObjectValue() {
return (CheckBoxList.CheckBoxListItem) this.objectValue;
return this.objectValue;
}
@Override