floraachy
/
MooInfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update oshi to 6.4.4 

new theme:Flat macOS
This commit is contained in:
rememberber 2023-07-24 21:45:32 +08:00
parent b26510d044
commit 1dc528803f
6 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -25,12 +25,12 @@
<commons-lang3.version>3.12.0</commons-lang3.version>
<guava.version>31.1-jre</guava.version>
<okhttp.version>4.10.0</okhttp.version>
<flatlaf.version>3.0</flatlaf.version>
<flatlaf-extras.version>3.0</flatlaf-extras.version>
<flatlaf-intellij-themes.version>3.0</flatlaf-intellij-themes.version>
<flatlaf.version>3.1.1</flatlaf.version>
<flatlaf-extras.version>3.1.1</flatlaf-extras.version>
<flatlaf-intellij-themes.version>3.1.1</flatlaf-intellij-themes.version>
<hutool-all.version>5.8.11</hutool-all.version>
<fastjson.version>2.0.22</fastjson.version>
<oshi-core.version>6.4.0</oshi-core.version>
<oshi-core.version>6.4.4</oshi-core.version>
<jfreechart.version>1.5.3</jfreechart.version>
</properties>
@ -134,7 +134,7 @@
<plugin>
<groupId>io.github.fvarrui</groupId>
<artifactId>javapackager</artifactId>
<version>1.6.5</version>
<version>1.7.2</version>
<configuration>
<bundleJre>true</bundleJre>
<mainClass>com.luoboduner.moo.info.App</mainClass>

2
src/main/java/com/luoboduner/moo/info/App.java
View File

@ -42,9 +42,7 @@ public class App {
System.setProperty("apple.laf.useScreenMenuBar", "true");
System.setProperty("apple.awt.application.name", "MooInfo");
System.setProperty("com.apple.mrj.application.apple.menu.about.name", "MooInfo");
if (UIUtil.isDarkLaf()) {
System.setProperty("apple.awt.application.appearance", "system");
}
FlatDesktop.setAboutHandler(() -> {
try {

7
src/main/java/com/luoboduner/moo/info/ui/Init.java
View File

@ -118,7 +118,12 @@ public class Init {
case "Vuesion":
FlatVuesionIJTheme.setup();
break;
case "Flat macOS Light":
FlatMacLightLaf.setup();
break;
case "Flat macOS Dark":
FlatMacDarkLaf.setup();
break;
default:
FlatDarculaLaf.setup();
}

4
src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java
View File

@ -55,7 +55,9 @@ public class TopMenuBar extends JMenuBar {
"IntelliJ Cyan",
"IntelliJ Light",
"Xcode-Dark",
"Vuesion"};
"Vuesion",
"Flat macOS Light",
"Flat macOS Dark"};
private static String[] fontNames = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();

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

@ -1,7 +1,9 @@
package com.luoboduner.moo.info.ui.form;
import com.formdev.flatlaf.util.SystemInfo;
import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager;
import com.luoboduner.moo.info.util.SystemUtil;
import lombok.Getter;
import javax.swing.*;
@ -44,6 +46,11 @@ public class MainWindow {
public void init() {
mainWindow = getInstance();
if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) {
GridLayoutManager gridLayoutManager = (GridLayoutManager) mainPanel.getLayout();
gridLayoutManager.setMargin(new Insets(20, 0, 0, 0));
}
mainWindow.getOverviewPanel().add(OverviewForm.getInstance().getMainPanel(), gridConstraints);
mainWindow.getDetailPanel().add(DetailForm.getInstance().getMainPanel(), gridConstraints);
mainWindow.getMemoryPanel().add(MemoryForm.getInstance().getMainPanel(), gridConstraints);

9
src/main/java/com/luoboduner/moo/info/ui/frame/MainFrame.java
View File

@ -1,10 +1,12 @@
package com.luoboduner.moo.info.ui.frame;
import com.formdev.flatlaf.extras.FlatSVGUtils;
import com.formdev.flatlaf.util.SystemInfo;
import com.luoboduner.moo.info.ui.UiConsts;
import com.luoboduner.moo.info.ui.component.TopMenuBar;
import com.luoboduner.moo.info.ui.listener.FrameListener;
import com.luoboduner.moo.info.util.ComponentUtil;
import com.luoboduner.moo.info.util.SystemUtil;
import javax.swing.*;
@ -26,6 +28,13 @@ public class MainFrame extends JFrame {
setJMenuBar(topMenuBar);
ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.6, 0.8);
if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) {
this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true);
this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true);
this.getRootPane().putClientProperty("apple.awt.fullscreenable", true);
this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false);
}
FrameListener.addListeners();
}