Skip to content

Commit 865dd77

Browse files
committed
Merge remote-tracking branch 'upstream/main' into main-gradle
2 parents 7a325a8 + cb1d425 commit 865dd77

File tree

4 files changed

+54
-5
lines changed

4 files changed

+54
-5
lines changed

.github/workflows/different.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Build libDifferent
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'core/different/different.m'
9+
- 'core/different/Makefile'
10+
11+
jobs:
12+
build-and-pr:
13+
runs-on: macos-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
steps:
19+
- uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
23+
- name: Run make in core/different
24+
run: |
25+
cd core/different
26+
make
27+
28+
- name: Create Pull Request
29+
uses: peter-evans/create-pull-request@v5
30+
with:
31+
commit-message: 'Update generated files from make'
32+
title: 'Update generated files from make'
33+
body: |
34+
This PR was automatically created after changes to:
35+
- core/different/different.m
36+
- core/different/Makefile
37+
38+
The `make` command was run and these are the resulting changes.
39+
branch: auto-different-updates
40+
base: main

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -2310,8 +2310,10 @@ public void prepareRun() {
23102310
internalCloseRunner();
23112311
statusEmpty();
23122312

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

23162318
// clear the console on each run, unless the user doesn't want to
23172319
if (Preferences.getBoolean("console.auto_clear")) {

build/shared/lib/defaults.txt

+9-1
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,16 @@ console.font.size = 12
165165
# number of lines to show by default
166166
console.lines = 4
167167

168-
# set to false to disable automatically clearing the console
168+
# Number of blank lines to advance/clear console.
169+
# Note that those lines are also printed in the terminal when
170+
# Processing is executed there.
171+
# Setting to 0 stops this behavior.
172+
console.head_padding = 10
173+
174+
# Set to false to disable automatically clearing the console
169175
# each time 'run' is hit
176+
# If one sets it to false, one may also want to set 'console.head_padding'
177+
# to a positive number to separate outputs from different runs.
170178
console.auto_clear = true
171179

172180
# number of days of history to keep around before cleaning

core/src/processing/core/PApplet.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3679,8 +3679,7 @@ public void cursor() {
36793679

36803680
/**
36813681
*
3682-
* Hides the cursor from view. Will not work when running the program in a
3683-
* web browser or when running in full screen (Present) mode.
3682+
* Hides the mouse cursor from view.
36843683
*
36853684
* <h3>Advanced</h3>
36863685
* Hide the cursor by creating a transparent image

0 commit comments

Comments
 (0)