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

Merge branch 'fixDeckEditorHover' into 'master'

Browse Source 
Fix no hover in deck editor when edit from lobby

Closes #1549

See merge request core-developers/forge!3598
This commit is contained in:
Sol
2021-01-18 03:24:42 +00:00
parent 46f5fefd2c 9c0a82091b
commit 97f6806beb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ import forge.itemmanager.ItemManagerModel;
import forge.itemmanager.SItemManagerUtil; import forge.itemmanager.SItemManagerUtil;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgePreferences; import forge.properties.ForgePreferences;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.match.controllers.CDetailPicture; import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.*; import forge.toolbox.*;
import forge.toolbox.FSkin.SkinColor; import forge.toolbox.FSkin.SkinColor;
@@ -772,6 +773,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
if (cDetailPicture != null) { if (cDetailPicture != null) {
cDetailPicture.showItem(item); cDetailPicture.showItem(item);
} }
else {
// if opened from lobby ItemManager has no own
CDeckEditorUI.SINGLETON_INSTANCE.setCard(item);
}
} }
@Override @Override