Polish AccountSettingsView

This commit is contained in:
Chris Beams 2014-11-25 00:41:39 +01:00
parent 70d9577e32
commit fac64807f6
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73

View file

@ -67,7 +67,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
@Override @Override
public void initialize() { public void initialize() {
listener = viewPath -> { listener = viewPath -> {
if (viewPath.size() != 4 || !viewPath.contains(AccountSettingsView.class)) if (viewPath.size() != 4 || viewPath.indexOf(AccountSettingsView.class) != 2)
return; return;
loadView(viewPath.tip()); loadView(viewPath.tip());
@ -94,8 +94,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
navigation.addListener(listener); navigation.addListener(listener);
ViewPath viewPath = navigation.getCurrentPath(); ViewPath viewPath = navigation.getCurrentPath();
if (viewPath.size() == 3 && viewPath.indexOf(AccountSettingsView.class) == 2) { if (viewPath.size() == 3 && viewPath.indexOf(AccountSettingsView.class) == 2) {
navigation.navigateTo( navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, FiatAccountView.class);
ViewPath.to(MainView.class, AccountView.class, AccountSettingsView.class, FiatAccountView.class));
} }
else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) { else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) {
loadView(viewPath.get(3)); loadView(viewPath.get(3));
@ -148,8 +147,8 @@ class MenuItem extends ToggleButton {
setGraphic(icon); setGraphic(icon);
setOnAction((event) -> navigation.navigateTo( setOnAction((event) ->
ViewPath.to(MainView.class, AccountView.class, AccountSettingsView.class, viewClass))); navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, viewClass));
selectedProperty().addListener((ov, oldValue, newValue) -> { selectedProperty().addListener((ov, oldValue, newValue) -> {
if (newValue) { if (newValue) {