Merge pull request #25 from rememberber/dev

Dev

Author: rememberber

.idea/icon.svg

@@ -1,5 +1,5 @@
 # MooInfo
-![logo](assets/logo/MooInfo.svg)
+![logo](assets/windows/MooInfo.ico)
 
 Visual implementation of OSHI, to view information about the system and hardware.
 

README.md

@@ -48,7 +48,7 @@ public void init() {
         mainWindow = getInstance();
         if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) {
             GridLayoutManager gridLayoutManager = (GridLayoutManager) mainPanel.getLayout();
-            gridLayoutManager.setMargin(new Insets(20, 0, 0, 0));
+            gridLayoutManager.setMargin(new Insets(25, 0, 0, 0));
         }
 
         mainWindow.getOverviewPanel().add(OverviewForm.getInstance().getMainPanel(), gridConstraints);

src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java

@@ -6,6 +6,8 @@
 import com.luoboduner.moo.info.util.SystemUtil;
 
 import javax.swing.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 
@@ -63,6 +65,39 @@ public void windowActivated(WindowEvent e) {
             }
         });
 
+        App.mainFrame.addMouseListener(new MouseListener() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount() == 2 && !e.isConsumed()) {
+                    if (App.mainFrame.getExtendedState() == JFrame.MAXIMIZED_BOTH) {
+                        App.mainFrame.setExtendedState(JFrame.NORMAL);
+                    } else {
+                        App.mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);
+                    }
+                }
+            }
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mouseEntered(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+
+            }
+        });
+
     }
 
 }

src/main/java/com/luoboduner/moo/info/ui/listener/FrameListener.java

@@ -75,6 +75,8 @@ public void setTheme(String theme) {
     public String getFont() {
         if (SystemUtil.isLinuxOs()) {
             return setting.getStr("font", "setting.appearance", "Noto Sans CJK HK");
+        } else if (SystemUtil.isMacOs()) {
+            return setting.getStr("font", "setting.appearance", "PingFang SC");
         } else {
             return setting.getStr("font", "setting.appearance", "Microsoft YaHei");
         }