Skip to content

Commit bc3fd53

Browse files
committed
Fix certain textfield and textarea fonts not drawing correctly on some Macs
1 parent 4f44ab6 commit bc3fd53

5 files changed

Lines changed: 12 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* Remove old multi-line filter buttons in TopNav that draw incorrectly on some PCs #1013
2020
* Minor UI/UX improvements to Spectrogram widget to increase clarity for all users
2121
* Add slower options for FFT data smoothing
22+
* Fix certain Textfield and TextArea fonts not drawing correctly on some Macs
2223

2324
# v5.0.9
2425

OpenBCI_GUI/ADS1299SettingsController.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ class ADS1299SettingsController {
387387
.setPosition(0, 0)
388388
.setCaptionLabel("")
389389
.setSize(120, 20)
390-
.setFont(f2)
390+
.setFont(createFont("Arial", 15, true))
391391
.setFocus(false)
392392
.setColor(color(26, 26, 26))
393393
.setColorBackground(color(255, 255, 255)) // text field bg color

OpenBCI_GUI/ConsoleLog.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ static class ConsoleWindow extends PApplet implements Runnable {
6565

6666
clipboardCopy = new ClipHelper();
6767
cp5 = new ControlP5(this);
68-
68+
PFont textAreaFont = createFont("Arial", 12, true);
6969
consoleTextArea = cp5.addTextarea("ConsoleWindow")
7070
.setPosition(0, headerHeight)
7171
.setSize(width, height - headerHeight)
72-
.setFont(p5)
72+
.setFont(textAreaFont)
7373
.setLineHeight(18)
7474
.setColor(color(242))
7575
.setColorBackground(color(42, 100))

OpenBCI_GUI/ControlPanel.pde

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ class WifiBox {
10001000
.setPosition(x + 90, y + 100)
10011001
.setCaptionLabel("")
10021002
.setSize(w - padding*2, 26)
1003-
.setFont(f2)
1003+
.setFont(createFont("Arial", 15, true))
10041004
.setFocus(false)
10051005
.setColor(color(26, 26, 26))
10061006
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -1296,7 +1296,7 @@ class SessionDataBox {
12961296
.setPosition(x + 60, y + 32)
12971297
.setCaptionLabel("")
12981298
.setSize(187, 26)
1299-
.setFont(f2)
1299+
.setFont(createFont("Arial", 15, true))
13001300
.setFocus(false)
13011301
.setColor(color(26, 26, 26))
13021302
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2098,7 +2098,7 @@ class GaleaBox {
20982098
.setPosition(x + w - padding*2 - 60*2, y + 16 + padding*2)
20992099
.setCaptionLabel("")
21002100
.setSize(120 + padding, 26)
2101-
.setFont(f2)
2101+
.setFont(createFont("Arial", 15, true))
21022102
.setFocus(false)
21032103
.setColor(color(26, 26, 26))
21042104
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2297,7 +2297,7 @@ class BrainFlowStreamerBox {
22972297
.setPosition(x + padding * 3, y + HEADER_H + padding*2)
22982298
.setCaptionLabel("")
22992299
.setSize(120, OBJECT_H)
2300-
.setFont(f2)
2300+
.setFont(createFont("Arial", 15, true))
23012301
.setFocus(false)
23022302
.setColor(color(26, 26, 26))
23032303
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2328,7 +2328,7 @@ class BrainFlowStreamerBox {
23282328
.setPosition(x + padding*5 + w/2, y + HEADER_H + padding*2)
23292329
.setCaptionLabel("")
23302330
.setSize(50, OBJECT_H)
2331-
.setFont(f2)
2331+
.setFont(createFont("Arial", 15, true))
23322332
.setFocus(false)
23332333
.setColor(color(26, 26, 26))
23342334
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2528,7 +2528,7 @@ class StreamingBoardBox {
25282528
.setPosition(x + padding * 3, y + headerH + padding*2)
25292529
.setCaptionLabel("")
25302530
.setSize(w / 3, objectH)
2531-
.setFont(f2)
2531+
.setFont(createFont("Arial", 15, true))
25322532
.setFocus(false)
25332533
.setColor(color(26, 26, 26))
25342534
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2545,7 +2545,7 @@ class StreamingBoardBox {
25452545
.setPosition(x + padding*5 + w/2, y + headerH + padding*2)
25462546
.setCaptionLabel("")
25472547
.setSize(w / 5 + padding, objectH)
2548-
.setFont(f2)
2548+
.setFont(createFont("Arial", 15, true))
25492549
.setFocus(false)
25502550
.setColor(color(26, 26, 26))
25512551
.setColorBackground(color(255, 255, 255)) // text field bg color

OpenBCI_GUI/W_Networking.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ class W_Networking extends Widget {
496496
cp5_networking.addTextfield(name)
497497
.align(10,100,10,100) // Alignment
498498
.setSize(120,20) // Size of textfield
499-
.setFont(f2)
499+
.setFont(createFont("Arial", 15, true))
500500
.setFocus(false) // Deselects textfield
501501
.setColor(color(26,26,26))
502502
.setColorBackground(color(255,255,255)) // text field bg color

0 commit comments

Comments
 (0)