Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into main-gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefterv committed Jan 17, 2025
2 parents 7a325a8 + cb1d425 commit 865dd77
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 5 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/different.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Build libDifferent

on:
push:
branches:
- main
paths:
- 'core/different/different.m'
- 'core/different/Makefile'

jobs:
build-and-pr:
runs-on: macos-latest
permissions:
contents: write
pull-requests: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Run make in core/different
run: |
cd core/different
make
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
commit-message: 'Update generated files from make'
title: 'Update generated files from make'
body: |
This PR was automatically created after changes to:
- core/different/different.m
- core/different/Makefile
The `make` command was run and these are the resulting changes.
branch: auto-different-updates
base: main
6 changes: 4 additions & 2 deletions app/src/processing/app/ui/Editor.java
Original file line number Diff line number Diff line change
Expand Up @@ -2310,8 +2310,10 @@ public void prepareRun() {
internalCloseRunner();
statusEmpty();

// do this to advance/clear the terminal window / dos prompt / etc
for (int i = 0; i < 10; i++) System.out.println();
// Do this to advance/clear the terminal window / dos prompt / etc.
// This may be useful especially when 'console.auto_clear' is false.
int headPadding = Preferences.getInteger("console.head_padding");
for (int i = 0; i < headPadding; i++) console.message("\n", false);

// clear the console on each run, unless the user doesn't want to
if (Preferences.getBoolean("console.auto_clear")) {
Expand Down
10 changes: 9 additions & 1 deletion build/shared/lib/defaults.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,16 @@ console.font.size = 12
# number of lines to show by default
console.lines = 4

# set to false to disable automatically clearing the console
# Number of blank lines to advance/clear console.
# Note that those lines are also printed in the terminal when
# Processing is executed there.
# Setting to 0 stops this behavior.
console.head_padding = 10

# Set to false to disable automatically clearing the console
# each time 'run' is hit
# If one sets it to false, one may also want to set 'console.head_padding'
# to a positive number to separate outputs from different runs.
console.auto_clear = true

# number of days of history to keep around before cleaning
Expand Down
3 changes: 1 addition & 2 deletions core/src/processing/core/PApplet.java
Original file line number Diff line number Diff line change
Expand Up @@ -3679,8 +3679,7 @@ public void cursor() {

/**
*
* Hides the cursor from view. Will not work when running the program in a
* web browser or when running in full screen (Present) mode.
* Hides the mouse cursor from view.
*
* <h3>Advanced</h3>
* Hide the cursor by creating a transparent image
Expand Down

0 comments on commit 865dd77

Please sign in to comment.