Skip to content

Commit f19b256

Browse files
committed
Rather than setting the decorations app wide, just modify the editor screen
1 parent ab9358f commit f19b256

File tree

2 files changed

+37
-34
lines changed

2 files changed

+37
-34
lines changed

app/src/processing/app/platform/LinuxPlatform.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,13 @@
2222

2323
package processing.app.platform;
2424

25-
import java.io.File;
26-
import java.awt.Desktop;
27-
import java.awt.Toolkit;
28-
2925
import processing.app.Base;
3026
import processing.app.Messages;
3127
import processing.app.Preferences;
3228
import processing.core.PApplet;
3329

34-
import javax.swing.*;
30+
import java.awt.*;
31+
import java.io.File;
3532

3633

3734
public class LinuxPlatform extends DefaultPlatform {
@@ -40,8 +37,6 @@ public class LinuxPlatform extends DefaultPlatform {
4037

4138
public void initBase(Base base) {
4239
super.initBase(base);
43-
44-
JFrame.setDefaultLookAndFeelDecorated(true);
4540
System.setProperty("flatlaf.menuBarEmbedded", "true");
4641

4742
// Set X11 WM_CLASS property which is used as the application

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

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,38 +23,42 @@
2323

2424
package processing.app.ui;
2525

26-
import java.awt.*;
27-
import java.awt.datatransfer.*;
28-
import java.awt.event.*;
29-
import java.awt.print.*;
30-
import java.io.*;
31-
import java.util.ArrayList;
32-
import java.util.Collections;
33-
import java.util.HashMap;
34-
import java.util.HashSet;
35-
import java.util.List;
36-
import java.util.Map;
37-
import java.util.Set;
38-
import java.util.Stack;
39-
import java.util.Timer;
40-
import java.util.TimerTask;
41-
import java.util.stream.Collectors;
42-
43-
import javax.swing.*;
44-
import javax.swing.border.EmptyBorder;
45-
import javax.swing.event.*;
46-
import javax.swing.plaf.basic.*;
47-
import javax.swing.text.*;
48-
import javax.swing.text.html.*;
49-
import javax.swing.undo.*;
50-
5126
import com.formdev.flatlaf.util.SystemInfo;
5227
import processing.app.*;
53-
import processing.utils.SketchException;
28+
import processing.app.Formatter;
5429
import processing.app.contrib.ContributionManager;
5530
import processing.app.laf.PdeMenuItemUI;
5631
import processing.app.syntax.*;
57-
import processing.core.*;
32+
import processing.core.PApplet;
33+
import processing.utils.SketchException;
34+
35+
import javax.swing.*;
36+
import javax.swing.border.EmptyBorder;
37+
import javax.swing.event.*;
38+
import javax.swing.plaf.basic.BasicSplitPaneDivider;
39+
import javax.swing.plaf.basic.BasicSplitPaneUI;
40+
import javax.swing.text.BadLocationException;
41+
import javax.swing.text.Element;
42+
import javax.swing.text.View;
43+
import javax.swing.text.ViewFactory;
44+
import javax.swing.text.html.HTMLEditorKit;
45+
import javax.swing.undo.CannotRedoException;
46+
import javax.swing.undo.CannotUndoException;
47+
import javax.swing.undo.CompoundEdit;
48+
import javax.swing.undo.UndoManager;
49+
import java.awt.*;
50+
import java.awt.datatransfer.DataFlavor;
51+
import java.awt.datatransfer.Transferable;
52+
import java.awt.event.*;
53+
import java.awt.print.PageFormat;
54+
import java.awt.print.PrinterException;
55+
import java.awt.print.PrinterJob;
56+
import java.io.File;
57+
import java.io.IOException;
58+
import java.util.*;
59+
import java.util.List;
60+
import java.util.Timer;
61+
import java.util.stream.Collectors;
5862

5963

6064
/**
@@ -207,6 +211,10 @@ public void windowDeactivated(WindowEvent e) {
207211
spacer.setAlignmentX(Component.LEFT_ALIGNMENT);
208212
box.add(spacer);
209213
}
214+
if (Platform.isLinux()) {
215+
setUndecorated(true);
216+
getRootPane().setWindowDecorationStyle(JRootPane.FRAME);
217+
}
210218

211219
rebuildModePopup();
212220
toolbar = createToolbar();

0 commit comments

Comments
 (0)