Skip to content

bugfix(gui): Remove slider bounds checks to prevent unexpected reset of custom settings #2624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 2 commits into from
Apr 21, 2026
Merged

bugfix(gui): Remove slider bounds checks to prevent unexpected reset of custom settings #2624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b2635
fix: Remove slider bounds check to prevent unwanted reset of custom s…
Skyaero42 Apr 18, 2026
a27e9ca
Updating based on feedback
Skyaero42 Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,14 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
Int newPos = (Int)mData1;
GameWindow *child = window->winGetChild();

if( newPos < s->minVal || newPos > s->maxVal )
Comment thread
Skyaero42 marked this conversation as resolved.
break;
// TheSuperHackers @fix No longer reject out of bounds positions to prevent
// reset of custom option.ini settings to 0.

s->position = newPos;

// Translate to window coords
newPos = (Int)((newPos - s->minVal) * s->numTicks);
newPos = clamp(0, newPos, (Int)((s->maxVal - s->minVal) * s->numTicks));

child->winSetPosition( newPos , HORIZONTAL_SLIDER_THUMB_POSITION );
break;
Expand Down
5 changes: 3 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,13 +378,14 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
Int newPos = (Int)mData1;
GameWindow *child = window->winGetChild();

if (newPos < s->minVal || newPos > s->maxVal)
break;
// TheSuperHackers @fix No longer reject out of bounds positions to prevent
// reset of custom option.ini settings to 0.

s->position = newPos;

// Translate to window coords
newPos = (Int)((s->maxVal - newPos) * s->numTicks);
newPos = clamp(0, newPos, (Int)((s->maxVal - s->minVal) * s->numTicks));
Comment thread
xezon marked this conversation as resolved.

child->winSetPosition( 0, newPos );

Expand Down
5 changes: 3 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,14 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
Int newPos = (Int)mData1;
GameWindow *child = window->winGetChild();

if( newPos < s->minVal || newPos > s->maxVal )
break;
// TheSuperHackers @fix No longer reject out of bounds positions to prevent
// reset of custom option.ini settings to 0.

s->position = newPos;

// Translate to window coords
newPos = (Int)((newPos - s->minVal) * s->numTicks);
newPos = clamp(0, newPos, (Int)((s->maxVal - s->minVal) * s->numTicks));

child->winSetPosition( newPos , HORIZONTAL_SLIDER_THUMB_POSITION );
break;
Expand Down
5 changes: 3 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,13 +378,14 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
Int newPos = (Int)mData1;
GameWindow *child = window->winGetChild();

if (newPos < s->minVal || newPos > s->maxVal)
break;
// TheSuperHackers @fix No longer reject out of bounds positions to prevent
// reset of custom option.ini settings to 0.

s->position = newPos;

// Translate to window coords
newPos = (Int)((s->maxVal - newPos) * s->numTicks);
newPos = clamp(0, newPos, (Int)((s->maxVal - s->minVal) * s->numTicks));

child->winSetPosition( 0, newPos );

Expand Down
Loading