Fixed expand all frame

Exslims · Apr 15, 2017 · cec2da6 · cec2da6
1 parent d93f2b1
commit cec2da6
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/app-core/src/main/java/com/mercury/platform/shared/ConfigManager.java b/app-core/src/main/java/com/mercury/platform/shared/ConfigManager.java
@@ -68,7 +68,7 @@ private static class ConfigManagerHolder {
     @Getter
     private boolean checkUpdateOnStartUp = true;
     @Getter
-    private boolean dismissAfterKick = false;
+    private boolean dismissAfterKick = true;
     @Getter
     private boolean showLeague = false;
     @Getter

diff --git a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/GeneralSettings.java b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/GeneralSettings.java
@@ -211,7 +211,7 @@ private JPanel getSettingsSlidePanel(){
                 componentsFactory.getIconButton("app/open-tests.png",
                         30,
                         AppThemeColor.TRANSPARENT,
-                        "Test frames");
+                        "Open tests");
         openTests.addActionListener(action -> {
             FramesManager.INSTANCE.hideFrame(SettingsFrame.class);
             FramesManager.INSTANCE.preShowFrame(TestCasesFrame.class);

diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/AbstractOverlaidFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/AbstractOverlaidFrame.java
@@ -48,7 +48,7 @@ public void mouseEntered(MouseEvent e) {
             }
         });
     }
-    private void changeVisible(FrameVisibleState state){
+    protected void changeVisible(FrameVisibleState state){
         if (processingHideEvent) {
             switch (state) {
                 case SHOW: {

diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/movable/container/IncMessageFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/movable/container/IncMessageFrame.java
@@ -110,13 +110,11 @@ public void initHandlers() {
                 setUpExpandButton();
             }
         });
-        MercuryStore.INSTANCE.messageSubject.subscribe(message -> {
-            SwingUtilities.invokeLater(()-> {
-                if(!currentMessages.containsKey(message)) {
-                    addMessage(message);
-                }
-            });
-        });
+        MercuryStore.INSTANCE.messageSubject.subscribe(message -> SwingUtilities.invokeLater(()-> {
+            if(!currentMessages.containsKey(message)) {
+                addMessage(message);
+            }
+        }));
         EventRouter.UI.registerHandler(CloseMessagePanelEvent.class, event -> {
             Message message = ((CloseMessagePanelEvent) event).getMessage();
             MessagePanel panel = currentMessages.get(message);
@@ -197,7 +195,9 @@ private void addMessage(Message message){
                     messagePanel.setVisible(false);
                 }
                 if (mainContainer.getComponentCount() > limitMsgCount) {
-                    setUpExpandButton();
+                    if(AppStarter.APP_STATUS == FrameVisibleState.SHOW) {
+                        setUpExpandButton();
+                    }
                     expandAllFrame.incMessageCount();
                 }
                 break;
@@ -207,14 +207,24 @@ private void addMessage(Message message){
                     messagePanel.setVisible(false);
                 }
                 if (mainContainer.getComponentCount() > (limitMsgCount + 1)) {
-                    setUpExpandButton();
+                    if(AppStarter.APP_STATUS == FrameVisibleState.SHOW) {
+                        setUpExpandButton();
+                    }
                     expandAllFrame.incMessageCount();
                 }
                 break;
             }
         }
     }
 
+    @Override
+    protected void changeVisible(FrameVisibleState state) {
+        super.changeVisible(state);
+        if(state.equals(FrameVisibleState.SHOW)) {
+            setUpExpandButton();
+        }
+    }
+
     private void setUpExpandButton(){
         if(!inScaleSettings && !inMoveMode && !dnd) {
             switch (flowDirections) {
@@ -318,9 +328,8 @@ protected JPanel getPanelForPINSettings() {
 
     private void onLimitCountChange(){
         expandAllFrame.resetMessageCount();
-        Arrays.stream(mainContainer.getComponents()).forEach(component -> {
-            component.setVisible(true);
-        });
+        Arrays.stream(mainContainer.getComponents())
+                .forEach(component -> component.setVisible(true));
         switch (flowDirections){
             case DOWNWARDS:{
                 Component[] components = mainContainer.getComponents();

diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TestCasesFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TestCasesFrame.java
@@ -11,6 +11,8 @@
 import javax.swing.*;
 import javax.swing.Timer;
 import java.awt.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.*;
@@ -32,7 +34,6 @@ public TestCasesFrame() {
         nickNames = new ArrayList<>();
         offer = new ArrayList<>();
         leagues = new ArrayList<>();
-
         items.add("Wondertrap Velvet Slippers");
         items.add("Rain of Arrows");
         items.add("Dreadarc Cleaver");