Merge branch 'master' into master

sotasan · Sep 30, 2023 · 2fab5f0 · 2fab5f0
2 parents 47c04f9 + 14089e1
commit 2fab5f0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .gradle
 .idea
+.DS_Store
 build
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id("application")
+    id("java")
     id("com.github.johnrengelman.shadow") version("8.1.1")
     id("io.freefair.lombok") version("8.3")
-    id("java")
 }
 
 group = "com.sotasan"

diff --git a/src/main/java/com/sotasan/decompiler/Main.java b/src/main/java/com/sotasan/decompiler/Main.java
@@ -5,6 +5,7 @@
 import com.formdev.flatlaf.extras.FlatInspector;
 import com.formdev.flatlaf.fonts.inter.FlatInterFont;
 import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
+import com.formdev.flatlaf.util.SystemInfo;
 import com.sotasan.decompiler.controllers.WindowController;
 import com.sotasan.decompiler.services.LoaderService;
 import lombok.SneakyThrows;
@@ -26,7 +27,7 @@ public static void main(String @NotNull [] args) {
         FlatLaf.setPreferredFontFamily(FlatInterFont.FAMILY);
         FlatLaf.registerCustomDefaultsSource("themes");
         FlatDarkLaf.setup();
-        FlatInspector.install("meta shift I");
+        FlatInspector.install(String.format("%s shift I", SystemInfo.isMacOS ? "meta" : "ctrl"));
 
         WindowController.getINSTANCE().show();
         if (args.length > 0)

diff --git a/src/main/java/com/sotasan/decompiler/views/TabsView.java b/src/main/java/com/sotasan/decompiler/views/TabsView.java
@@ -20,6 +20,7 @@ public class TabsView extends FlatTabbedPane {
     public TabsView() {
         addMouseListener(new TabMouseAdapter());
         setHasFullBorder(true);
+        setMinimumSize(new Dimension(250, 0));
         setTabsClosable(true);
         setTabCloseCallback(this::onTabClose);
         setTabLayoutPolicy(SCROLL_TAB_LAYOUT);

diff --git a/src/main/java/com/sotasan/decompiler/views/WindowView.java b/src/main/java/com/sotasan/decompiler/views/WindowView.java
@@ -47,15 +47,19 @@ public WindowView() {
 
         JPanel panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
+        panel.setMinimumSize(new Dimension(100, 0));
         splitPane.setLeftComponent(panel);
 
         if (SystemInfo.isMacFullWindowContentSupported) {
             getRootPane().putClientProperty("apple.awt.fullWindowContent", true);
             getRootPane().putClientProperty("apple.awt.transparentTitleBar", true);
             getRootPane().putClientProperty("apple.awt.windowTitleVisible", false);
 
+            // TODO: macos maximized window support
+            Dimension dimension = new Dimension(0, 25);
             JPanel macos = new JPanel();
-            macos.setPreferredSize(new Dimension(0, 25));
+            macos.setMinimumSize(dimension);
+            macos.setPreferredSize(dimension);
             panel.add(macos);
         }
 

diff --git a/src/test/resources/META-INF/screenshot.png b/src/test/resources/META-INF/screenshot.png