Merge pull request #2109 from ripcurlx/minor-dao-fixes

Minor DAO ui fixes
bisq-network · Dec 11, 2018 · f0025a4 · f0025a4
2 parents 63b7c2c + 84c73f4
commit f0025a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/desktop/src/main/java/bisq/desktop/components/MenuItem.java b/desktop/src/main/java/bisq/desktop/components/MenuItem.java
@@ -130,7 +130,7 @@ public void deactivate() {
     }
 
     public void setLabelText(String value) {
-        setText(value);
+        setText(value.toUpperCase());
     }
 
 

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/DaoView.java b/desktop/src/main/java/bisq/desktop/main/dao/DaoView.java
@@ -40,6 +40,7 @@
 
 import javafx.fxml.FXML;
 
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 
@@ -136,6 +137,15 @@ protected void deactivate() {
     }
 
     private void loadView(Class<? extends View> viewClass) {
+
+        if (selectedTab != null && selectedTab.getContent() != null) {
+            if (selectedTab.getContent() instanceof ScrollPane) {
+                ((ScrollPane) selectedTab.getContent()).setContent(null);
+            } else {
+                selectedTab.setContent(null);
+            }
+        }
+
         View view = viewLoader.load(viewClass);
         if (view instanceof BsqWalletView) {
             selectedTab = bsqWalletTab;
-Original file line number
+Diff line change
@@ Expand Up / @@ -130,7 +130,7 @@ public void deactivate() { @@
         }
         public void setLabelText(String value) {
-            setText(value);
+            setText(value.toUpperCase());
         }
@@ Expand Down @@