Skip to content

Commit 6618cad

Browse files
committed
macOS tItle bar tweak
1 parent b8e84da commit 6618cad

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,4 @@ java/build/
108108
/java/libraries/svg/bin
109109
/java/preprocessor/build
110110
/java/lsp/build
111+
/.kotlin/sessions

app/src/processing/app/ui/Editor.java

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@
2323

2424
package processing.app.ui;
2525

26-
import java.awt.BorderLayout;
27-
import java.awt.Component;
28-
import java.awt.Dimension;
29-
import java.awt.EventQueue;
30-
import java.awt.Font;
31-
import java.awt.Frame;
32-
import java.awt.Point;
26+
import java.awt.*;
3327
import java.awt.datatransfer.*;
3428
import java.awt.event.*;
3529
import java.awt.print.*;
@@ -54,6 +48,7 @@
5448
import javax.swing.text.html.*;
5549
import javax.swing.undo.*;
5650

51+
import com.formdev.flatlaf.util.SystemInfo;
5752
import processing.app.Base;
5853
import processing.app.Formatter;
5954
import processing.app.Language;
@@ -211,6 +206,19 @@ public void windowDeactivated(WindowEvent e) {
211206
Box box = Box.createVerticalBox();
212207
Box upper = Box.createVerticalBox();
213208

209+
if(SystemInfo.isMacFullWindowContentSupported) {
210+
getRootPane().putClientProperty( "apple.awt.fullWindowContent", true );
211+
getRootPane().putClientProperty( "apple.awt.transparentTitleBar", true );
212+
213+
var color = Theme.getColor("toolbar.gradient.top");
214+
var spacer = new JPanel();
215+
spacer.setPreferredSize(new Dimension(1, Toolkit.zoom(18)));
216+
spacer.setMinimumSize(new Dimension(1, Toolkit.zoom(18)));
217+
spacer.setBackground(color);
218+
spacer.setAlignmentX(Component.LEFT_ALIGNMENT);
219+
box.add(spacer);
220+
}
221+
214222
rebuildModePopup();
215223
toolbar = createToolbar();
216224
upper.add(toolbar);

app/src/processing/app/ui/Start.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
package processing.app.ui
22

33
import androidx.compose.animation.AnimatedVisibility
4-
import androidx.compose.animation.EnterExitState
54
import androidx.compose.animation.core.LinearEasing
65
import androidx.compose.animation.core.tween
76
import androidx.compose.animation.fadeIn
87
import androidx.compose.animation.fadeOut
98
import androidx.compose.foundation.Image
109
import androidx.compose.foundation.layout.fillMaxSize
11-
import androidx.compose.foundation.layout.padding
1210
import androidx.compose.foundation.shape.RoundedCornerShape
13-
import androidx.compose.material.Text
1411
import androidx.compose.runtime.*
1512
import androidx.compose.ui.Alignment
1613
import androidx.compose.ui.Modifier
1714
import androidx.compose.ui.draw.clip
18-
import androidx.compose.ui.draw.shadow
1915
import androidx.compose.ui.graphics.toComposeImageBitmap
2016
import androidx.compose.ui.unit.DpSize
2117
import androidx.compose.ui.unit.dp
2218
import androidx.compose.ui.window.*
23-
import kotlinx.coroutines.Dispatchers
2419
import kotlinx.coroutines.delay
2520
import kotlinx.coroutines.launch
2621
import processing.app.Base
2722
import processing.app.Platform
2823
import javax.imageio.ImageIO
29-
import javax.swing.SwingUtilities
3024

3125
/**
3226
* Show a splash screen window. A rewrite of Splash.java

java/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ tasks.compileJava{
4545
}
4646

4747
tasks.register<Copy>("extraResources"){
48+
dependsOn(":java:copyCore")
4849
from(".")
4950
include("keywords.txt")
5051
include("theme/**/*")
@@ -53,8 +54,8 @@ tasks.register<Copy>("extraResources"){
5354
}
5455
tasks.register<Copy>("copyCore"){
5556
val coreProject = project(":core")
56-
dependsOn(coreProject.tasks.named("jar"))
57-
from(coreProject.tasks.named("jar")) {
57+
dependsOn(coreProject.tasks.jar)
58+
from(coreProject.tasks.jar) {
5859
include("core*.jar")
5960
}
6061
rename("core.+\\.jar", "core.jar")

0 commit comments

Comments
 (0)