Skip to content

Commit

Permalink
Merge pull request #1196 from OpenBCI/1195-gui-v600-beta0-crashes-whe…
Browse files Browse the repository at this point in the history
…n-resizing-during-session

Fix GUI v6.0.0-beta.0 crash when resizing during session
  • Loading branch information
retiutut authored Sep 28, 2023
2 parents 513407f + 835f31d commit 343c302
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion OpenBCI_GUI/OpenBCI_GUI.pde
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
// Global Variables & Instances
//------------------------------------------------------------------------
//Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
String localGUIVersionString = "v6.0.0-beta.0";
String localGUIVersionString = "v6.0.0-beta.1";
String localGUIVersionDate = "September 2023";
String guiLatestVersionGithubAPI = "https://api.github.com/repos/OpenBCI/OpenBCI_GUI/releases/latest";
String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";
Expand Down
6 changes: 2 additions & 4 deletions OpenBCI_GUI/W_Marker.pde
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ class W_Marker extends Widget {
private Textfield markerReceivePortTextfield;
private String markerReceiveIP = "127.0.0.1";
private int markerReceivePort = 12350;
private final int MARKER_RECEIVE_TEXTFIELD_WIDTH = 100;
private final int MARKER_RECEIVE_TEXTFIELD_HEIGHT = 20;
private final int MARKER_RECEIVE_TEXTFIELD_WIDTH = 108;
private final int MARKER_RECEIVE_TEXTFIELD_HEIGHT = 22;

private hypermedia.net.UDP udpReceiver;

Expand Down Expand Up @@ -144,11 +144,9 @@ class W_Marker extends Widget {

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

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

private void createMarkerButtons() {
Expand Down

0 comments on commit 343c302

Please sign in to comment.