Skip to content

Commit 343c302

Browse files
authored
Merge pull request #1196 from OpenBCI/1195-gui-v600-beta0-crashes-when-resizing-during-session
Fix GUI v6.0.0-beta.0 crash when resizing during session
2 parents 513407f + 835f31d commit 343c302

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

OpenBCI_GUI/OpenBCI_GUI.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
6262
// Global Variables & Instances
6363
//------------------------------------------------------------------------
6464
//Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
65-
String localGUIVersionString = "v6.0.0-beta.0";
65+
String localGUIVersionString = "v6.0.0-beta.1";
6666
String localGUIVersionDate = "September 2023";
6767
String guiLatestVersionGithubAPI = "https://api.github.com/repos/OpenBCI/OpenBCI_GUI/releases/latest";
6868
String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";

OpenBCI_GUI/W_Marker.pde

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class W_Marker extends Widget {
2727
private Textfield markerReceivePortTextfield;
2828
private String markerReceiveIP = "127.0.0.1";
2929
private int markerReceivePort = 12350;
30-
private final int MARKER_RECEIVE_TEXTFIELD_WIDTH = 100;
31-
private final int MARKER_RECEIVE_TEXTFIELD_HEIGHT = 20;
30+
private final int MARKER_RECEIVE_TEXTFIELD_WIDTH = 108;
31+
private final int MARKER_RECEIVE_TEXTFIELD_HEIGHT = 22;
3232

3333
private hypermedia.net.UDP udpReceiver;
3434

@@ -144,11 +144,9 @@ class W_Marker extends Widget {
144144

145145
RectDimensions ipTextfieldPosition = markerUIGrid.getCellDims(3, 1);
146146
markerReceiveIPTextfield.setPosition(ipTextfieldPosition.x, ipTextfieldPosition.y + HALF_CELL_PADDING);
147-
markerReceiveIPTextfield.setSize(ipTextfieldPosition.w, ipTextfieldPosition.h - CELL_PADDING);
148147

149148
RectDimensions portTextfieldPosition = markerUIGrid.getCellDims(3, 3);
150149
markerReceivePortTextfield.setPosition(portTextfieldPosition.x, portTextfieldPosition.y + HALF_CELL_PADDING);
151-
markerReceivePortTextfield.setSize(portTextfieldPosition.w, portTextfieldPosition.h - CELL_PADDING);
152150
}
153151

154152
private void createMarkerButtons() {

0 commit comments

Comments
 (0)