external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Draft GUI flow

Browse Source
This commit is contained in:
tool4EvEr
2021-01-15 22:32:07 +01:00
parent a32611528e
commit 704f93a4dc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
View File

@@ -225,7 +225,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
group.isCollapsed = !group.isCollapsed; group.isCollapsed = !group.isCollapsed;
btnExpandCollapseAll.updateIsAllCollapsed(); btnExpandCollapseAll.updateIsAllCollapsed();
clearSelection(); //must clear selection since indices and visible items will be changing clearSelection(); //must clear selection since indices and visible items will be changing
updateLayout(false); updateLayout(true);
} }
break; break;
} }

2
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java
View File

@@ -300,7 +300,7 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
*/ */
@Override @Override
public boolean canSwitchAway(boolean isClosing) { public boolean canSwitchAway(boolean isClosing) {
if (isClosing && !saved) { if (isClosing && !saved && this.boosterDraft.hasNextChoice()) {
String userPrompt = localizer.getMessage("lblEndDraftConfirm"); String userPrompt = localizer.getMessage("lblEndDraftConfirm");
return FOptionPane.showConfirmDialog(userPrompt, localizer.getMessage("lblLeaveDraft"), localizer.getMessage("lblLeave"), localizer.getMessage("lblCancel"), false); return FOptionPane.showConfirmDialog(userPrompt, localizer.getMessage("lblLeaveDraft"), localizer.getMessage("lblLeave"), localizer.getMessage("lblCancel"), false);
} }