Skip to content

Commit 43648d7

Browse files
committed
Fix shadowed build + theme enhancements for macOS
1 parent 5625e51 commit 43648d7

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

gui/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ tasks.named("shadowJar", ShadowJar) {
2929
archiveBaseName.set("RetroMCP-GUI")
3030
archiveClassifier.set("all")
3131
setDestinationDirectory(rootProject.getLayout().getBuildDirectory().dir("libs"))
32-
minimize() // This breaks FlatLaf
32+
minimize() {
33+
exclude(dependency(libs.flatlaf.get()))
34+
}
3335
}

gui/src/main/java/org/mcphackers/mcp/Theme.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
import com.formdev.flatlaf.FlatDarkLaf;
1313
import com.formdev.flatlaf.FlatIntelliJLaf;
1414
import com.formdev.flatlaf.FlatLightLaf;
15+
import com.formdev.flatlaf.themes.FlatMacDarkLaf;
16+
import com.formdev.flatlaf.themes.FlatMacLightLaf;
17+
import org.mcphackers.mcp.tools.OS;
1518

1619
public class Theme {
1720
public static final Map<String, Theme> THEMES_MAP = new HashMap<>();
@@ -25,6 +28,11 @@ public class Theme {
2528
addTheme(FlatDarkLaf.NAME, FlatDarkLaf.class.getName());
2629
addTheme(FlatIntelliJLaf.NAME, FlatIntelliJLaf.class.getName());
2730
addTheme(FlatDarculaLaf.NAME, FlatDarculaLaf.class.getName());
31+
32+
if (OS.getOs() == OS.osx) {
33+
addTheme(FlatMacLightLaf.NAME, FlatMacLightLaf.class.getName());
34+
addTheme(FlatMacDarkLaf.NAME, FlatMacDarkLaf.class.getName());
35+
}
2836
}
2937

3038
public final String themeName;

gui/src/main/java/org/mcphackers/mcp/gui/TextAreaOutputStream.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ public void print(String s) {
3434

3535
@Override
3636
public void println(String s) {
37-
super.println(s);
38-
printString("\n");
37+
if (s != null && !s.isEmpty()) {
38+
super.println(s);
39+
printString("\n");
40+
}
3941
}
4042

4143
private void printString(String msg) {

0 commit comments

Comments
 (0)