Skip to content

Commit bfb87e6

Browse files
committed
Team Review - UI colors and fonts
1 parent 5067fd7 commit bfb87e6

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

OpenBCI_GUI/ConsoleLog.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static class ConsoleWindow extends PApplet implements Runnable {
6565

6666
clipboardCopy = new ClipHelper();
6767
cp5 = new ControlP5(this);
68-
PFont textAreaFont = createFont("Helvetica", 12, true);
68+
PFont textAreaFont = createFont("Arial", 12, true);
6969
consoleTextArea = cp5.addTextarea("ConsoleWindow")
7070
.setPosition(0, headerHeight)
7171
.setSize(width, height - headerHeight)

OpenBCI_GUI/CustomCp5Classes.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ public class MenuList extends controlP5.Controller {
216216
menu.fill(127, 134, 143);
217217
}
218218
if (i == activeItem) {
219-
menu.stroke(184, 220, 105, 255);
219+
menu.stroke(TURN_ON_GREEN);
220220
menu.strokeWeight(1);
221-
menu.fill(184, 220, 105, 255);
221+
menu.fill(TURN_ON_GREEN);
222222
menu.rect(0, 0, getWidth()-1, itemHeight-1 );
223223
menu.noStroke();
224224
} else {

OpenBCI_GUI/Debugging.pde

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ class HelpWidget {
129129
}
130130

131131
private color getTextColor() {
132+
/*
132133
switch (curOutputLevel) {
133134
case INFO:
134135
return #00529B;
@@ -140,8 +141,10 @@ class HelpWidget {
140141
return #D8000C;
141142
case DEFAULT:
142143
default:
143-
return color(0, 5, 11);
144+
return color(0, 5, 11);
144145
}
146+
*/
147+
return OPENBCI_DARKBLUE;
145148
}
146149

147150
private color getBackgroundColor(int fadeVal) {
@@ -155,6 +158,7 @@ class HelpWidget {
155158
return color(199, sat, 97);
156159
case SUCCESS:
157160
//base color - #DFF2BF;
161+
maxSat = 50;
158162
sat = 25;
159163
sat = (int)map(fadeVal, 0, 100, sat, maxSat);
160164
return color(106, sat, 95);

OpenBCI_GUI/FilterUI.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ class FilterUIPopup extends PApplet implements Runnable {
547547
.setPosition(_x, _y)
548548
.setCaptionLabel("")
549549
.setSize(_w, _h)
550-
.setFont(createFont("Helvetica",12,true))
550+
.setFont(createFont("Arial",12,true))
551551
.setFocus(false)
552552
.setColor(color(26, 26, 26))
553553
.setColorBackground(color(255, 255, 255)) // text field bg color

OpenBCI_GUI/OpenBCI_GUI.pde

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ final color buttonsLightBlue = color(57,128,204);
238238
final color GREY_125 = color(125);
239239
final color GREY_100 = color(100);
240240
final color GREY_20 = color(20);
241-
final color TURN_ON_GREEN = color(184,220,105);
241+
final color TURN_ON_GREEN = color(223, 242, 191);
242242
final color TURN_OFF_RED = color(224, 56, 45);
243243
final color BUTTON_HOVER = color(177, 184, 193);//color(252, 221, 198);
244244
final color BUTTON_HOVER_LIGHT = color(211, 222, 232);
@@ -337,6 +337,7 @@ void settings() {
337337
globalScreenResolution.append(" X ");
338338
globalScreenResolution.append(displayHeight);
339339
//Account for high-dpi displays on Mac, Windows, and Linux Machines Fixes #968
340+
if (isMac())
340341
//pixelDensity(displayDensity());
341342
globalScreenDPI = new StringBuilder("High-DPI Screen Detected: ");
342343
globalScreenDPI.append(displayDensity() == 2);
@@ -349,12 +350,7 @@ void setup() {
349350

350351
//V1 FONTS
351352
f1 = createFont("fonts/Raleway-SemiBold.otf", 16);
352-
if (isMac()) {
353-
f2 = createFont("Arial", 15, true);
354-
} else {
355-
f2 = createFont("fonts/Raleway-Regular.otf", 15);
356-
}
357-
353+
f2 = createFont("fonts/Raleway-Regular.otf", 15);
358354
f3 = createFont("fonts/Raleway-SemiBold.otf", 15);
359355
f4 = createFont("fonts/Raleway-SemiBold.otf", 64); // clear bigger fonts for widgets
360356

OpenBCI_GUI/SignalCheckThresholds.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SignalCheckThresholdUI {
4545
.setPosition(_x, _y)
4646
.setCaptionLabel("")
4747
.setSize(_w, _h)
48-
.setFont(createFont("Helvetica",12,true))
48+
.setFont(p5)
4949
.setFocus(false)
5050
.setColor(color(26, 26, 26))
5151
.setColorBackground(color(255, 255, 255)) // text field bg color

0 commit comments

Comments
 (0)