Merge branch 'main' into runner

Author: Stefterv

CONTRIBUTING.md

@@ -18,9 +18,6 @@ Most activity on Processing’s GitHub happens in _issues_. Issues are GitHub po
 
 To file a new issue, visit the [Issues](https://github.com/processing/processing4/issues) tab on the repository and click `New issue` then select the most appropriate template and follow the included instructions. These templates help maintainers understand and respond to issues faster.
 
->[!NOTE]
-> Before opening a new issue, check our [troubleshooting](https://github.com/processing/processing/wiki/Troubleshooting) page. The answer may already be there.
-
 ## Working on the Processing codebase
 
 ### Prerequisites

app/src/main/resources/processing/app/laf/FlatLaf.properties

@@ -0,0 +1,23 @@
+# The default is 8, which creates tiny nubby scroll bars
+ScrollBar.width = 16
+
+TitlePane.inactiveForeground = #000000
+
+
+# Better matched for macOS dark mode (but using everywhere)
+# https://github.com/JFormDesigner/FlatLaf/issues/497
+
+[dark]@background = #1e1e1e
+[dark]@foreground = #e0e0e0
+[dark]@accentColor = #107aff
+[dark]@accentFocusColor = #176896
+
+[dark]Component.arrowType = chevron
+
+[dark]CheckBox.icon.style = filled
+[dark]CheckBox.icon[filled].selectedBorderColor = @accentColor
+[dark]CheckBox.icon[filled].selectedBackground = @accentColor
+[dark]CheckBox.icon[filled].checkmarkColor = @foreground
+
+[dark]RadioButton.icon.style = filled
+[dark]RadioButton.icon[filled].centerDiameter = 6

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

@@ -31,6 +31,8 @@
 import processing.app.Preferences;
 import processing.core.PApplet;
 
+import javax.swing.*;
+
 
 public class LinuxPlatform extends DefaultPlatform {
   String homeDir;
@@ -39,6 +41,9 @@ public class LinuxPlatform extends DefaultPlatform {
   public void initBase(Base base) {
     super.initBase(base);
 
+    JFrame.setDefaultLookAndFeelDecorated(true);
+    System.setProperty("flatlaf.menuBarEmbedded", "true");
+
     // Set X11 WM_CLASS property which is used as the application
     // name by Gnome 3 and other window managers.
     // https://github.com/processing/processing/issues/2534

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

@@ -377,6 +377,7 @@ public void actionPerformed(ActionEvent e) {
         }
       });
     }
+
   }
 
 
@@ -626,12 +627,10 @@ public void updateTheme() {
     toolTipWarningColor = Theme.get("errors.selection.warning.bgcolor");
     toolTipErrorColor = Theme.get("errors.selection.error.bgcolor");
 
-    if(Platform.isWindows()) {
-      UIManager.put("RootPane.background", color);
-      UIManager.put("TitlePane.embeddedForeground", Theme.getColor("editor.fgcolor"));
-      getRootPane().updateUI();
-      UIManager.put("RootPane.background", null);
-    }
+    UIManager.put("RootPane.background", color);
+    UIManager.put("TitlePane.embeddedForeground", Theme.getColor("editor.fgcolor"));
+    getRootPane().updateUI();
+    UIManager.put("RootPane.background", null);
 
     JPopupMenu popup = modePopup.getPopupMenu();
     // Cannot use instanceof because com.formdev.flatlaf.ui.FlatPopupMenuBorder
@@ -822,6 +821,18 @@ protected JMenu buildEditMenu() {
     item.addActionListener(e -> handleIndentOutdent(false));
     menu.add(item);
 
+    item = Toolkit.newJMenuItemExt("menu.edit.increase_font");
+    item.addActionListener(e -> {
+      modifyFontSize(true);
+    });
+    menu.add(item);
+
+    item = Toolkit.newJMenuItemExt("menu.edit.decrease_font");
+    item.addActionListener(e -> {
+      modifyFontSize(false);
+    });
+    menu.add(item);
+
     menu.addSeparator();
 
     item = Toolkit.newJMenuItem(Language.text("menu.edit.find"), 'F');
@@ -879,6 +890,16 @@ public void menuSelected(MenuEvent e) {
     return menu;
   }
 
+  protected void modifyFontSize(boolean increase){
+    var fontSize = Preferences.getInteger("editor.font.size");
+    fontSize += increase ? 1 : -1;
+    fontSize = Math.max(5, Math.min(72, fontSize));
+    Preferences.setInteger("editor.font.size", fontSize);
+    for (Editor editor : base.getEditors()) {
+      editor.applyPreferences();
+    }
+    Preferences.save();
+  }
 
   abstract public JMenu buildSketchMenu();
 

app/src/processing/app/ui/EditorFooter.java

@@ -111,7 +111,7 @@ public EditorFooter(Editor eddie) {
     tabBar.add(controller);
 
     version = new JLabel(Base.getVersionName());
-    version.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, MARGIN));
+    version.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, Editor.RIGHT_GUTTER));
     version.addMouseListener(new MouseAdapter() {
       public void mousePressed(MouseEvent e) {
         if(e.getClickCount() == 5){

app/src/processing/app/ui/ExamplesFrame.java

@@ -33,6 +33,8 @@
 import java.awt.event.MouseEvent;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Enumeration;
 
 import javax.swing.Box;
@@ -57,6 +59,7 @@
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.SketchReference;
+import processing.app.contrib.Contribution;
 import processing.app.contrib.ContributionManager;
 import processing.app.contrib.ContributionType;
 import processing.app.contrib.ExamplesContribution;
@@ -313,9 +316,11 @@ protected DefaultMutableTreeNode buildTree() {
       }
 
       // Get examples for third party libraries
-      DefaultMutableTreeNode contributedLibExamples = new
-        DefaultMutableTreeNode(Language.text("examples.libraries"));
-      for (Library lib : mode.contribLibraries) {
+      DefaultMutableTreeNode contributedLibExamples = new DefaultMutableTreeNode(Language.text("examples.libraries"));
+      var sortedContribLibs = new ArrayList<>(mode.contribLibraries);
+      // Sort the libraries by actual name (not the name of the folder)
+      sortedContribLibs.sort(Comparator.comparing(Contribution::getName));
+      for (Library lib : sortedContribLibs) {
         if (lib.hasExamples()) {
             DefaultMutableTreeNode libNode =
               new DefaultMutableTreeNode(lib.getName());

build/shared/lib/languages/PDE.properties

@@ -59,6 +59,14 @@ menu.edit.decrease_indent = ← Decrease Indent
 menu.edit.decrease_indent.keystroke.macos = meta pressed OPEN_BRACKET
 menu.edit.decrease_indent.keystroke.windows = ctrl pressed OPEN_BRACKET
 menu.edit.decrease_indent.keystroke.linux = ctrl pressed OPEN_BRACKET
+menu.edit.increase_font = Increase Font Size
+menu.edit.increase_font.keystroke.macos = meta pressed EQUALS
+menu.edit.increase_font.keystroke.windows = ctrl pressed EQUALS
+menu.edit.increase_font.keystroke.linux = ctrl pressed EQUALS
+menu.edit.decrease_font = Decrease Font Size
+menu.edit.decrease_font.keystroke.macos = meta pressed MINUS
+menu.edit.decrease_font.keystroke.windows = ctrl pressed MINUS
+menu.edit.decrease_font.keystroke.linux = ctrl pressed MINUS
 menu.edit.find = Find...
 menu.edit.find_next = Find Next
 menu.edit.find_previous = Find Previous