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

Inline skin selector repaired.

Browse Source
This commit is contained in:
Doublestrike
2012-02-15 11:02:53 +00:00
parent 9ccfc932ad
commit b70fd7175c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/control/home/ControlSettings.java
View File

@@ -15,6 +15,7 @@ import javax.swing.event.ListSelectionListener;
import forge.Command; import forge.Command;
import forge.Constant; import forge.Constant;
import forge.Singletons; import forge.Singletons;
import forge.control.FControl;
import forge.properties.ForgePreferences; import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
import forge.view.home.ViewSettings; import forge.view.home.ViewSettings;
@@ -217,10 +218,8 @@ public class ControlSettings {
@Override @Override
protected void done() { protected void done() {
view.getLblTitleSkin().setIcon(null); Singletons.getView().instantiateCachedUIStates();
view.getLblTitleSkin().setText("Choose Skin"); Singletons.getControl().changeState(FControl.HOME_SCREEN);
Singletons.getControl().changeState(0);
Singletons.getView().getHomeView().showSettingsMenu(); Singletons.getView().getHomeView().showSettingsMenu();
} }
}; };

13
src/main/java/forge/view/FView.java
View File

@@ -101,10 +101,7 @@ public final class FView extends JFrame {
FView.this.lpnContent.add(overlay, JLayeredPane.MODAL_LAYER); FView.this.lpnContent.add(overlay, JLayeredPane.MODAL_LAYER);
// Instantiate all different state screens // Instantiate all different state screens
FView.this.home = new ViewHomeUI(); instantiateCachedUIStates();
FView.this.match = new ViewMatchUI();
FView.this.editor = new ViewEditorUI();
FView.this.bazaar = new ViewBazaarUI();
// All is ready to go - fire up home screen and discard splash frame. // All is ready to go - fire up home screen and discard splash frame.
Singletons.getControl().changeState(FControl.HOME_SCREEN); Singletons.getControl().changeState(FControl.HOME_SCREEN);
@@ -178,4 +175,12 @@ public final class FView extends JFrame {
} }
return FView.this.bazaar; return FView.this.bazaar;
} }
/** Like it says. */
public void instantiateCachedUIStates() {
FView.this.home = new ViewHomeUI();
FView.this.match = new ViewMatchUI();
FView.this.editor = new ViewEditorUI();
FView.this.bazaar = new ViewBazaarUI();
}
} }