github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert application of CVarClear on UIWidgets widgets (need to preserve manually-set default states).

Browse source
This commit is contained in:
Malkierian 2025-05-08 08:37:40 -07:00
commit 24e7fb35cf
2 changed files with 14 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

51
soh/soh/SohGui/UIWidgets.cpp
View file

@ -378,11 +378,7 @@ bool CVarCheckbox(const char* label, const char* cvarName, const CheckboxOptions
bool dirty = false;
bool value = (bool)CVarGetInteger(cvarName, options.defaultValue);
if (Checkbox(label, &value, options)) {
if (value == options.defaultValue) {
CVarClear(cvarName);
} else {
CVarSetInteger(cvarName, value);
}
CVarSetInteger(cvarName, value);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(cvarName);
dirty = true;
@ -613,11 +609,7 @@ bool CVarSliderInt(const char* label, const char* cvarName, const IntSliderOptio
bool dirty = false;
int32_t value = CVarGetInteger(cvarName, options.defaultValue);
if (SliderInt(label, &value, options)) {
if (value == options.defaultValue) {
CVarClear(cvarName);
} else {
CVarSetInteger(cvarName, value);
}
CVarSetInteger(cvarName, value);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(cvarName);
dirty = true;
@ -748,11 +740,7 @@ bool CVarSliderFloat(const char* label, const char* cvarName, const FloatSliderO
bool dirty = false;
float value = CVarGetFloat(cvarName, options.defaultValue);
if (SliderFloat(label, &value, options)) {
if (value == options.defaultValue) {
CVarClear(cvarName);
} else {
CVarSetFloat(cvarName, value);
}
CVarSetFloat(cvarName, value);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(cvarName);
dirty = true;
@ -826,11 +814,7 @@ bool CVarInputString(const char* label, const char* cvarName, const InputOptions
bool dirty = false;
std::string value = CVarGetString(cvarName, options.defaultValue.c_str());
if (InputString(label, &value, options)) {
if (value == options.defaultValue) {
CVarClear(cvarName);
} else {
CVarSetString(cvarName, value.c_str());
}
CVarSetString(cvarName, value.c_str());
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(cvarName);
dirty = true;
@ -882,11 +866,7 @@ bool CVarInputInt(const char* label, const char* cvarName, const InputOptions& o
int32_t defaultValue = std::stoi(options.defaultValue);
int32_t value = CVarGetInteger(cvarName, defaultValue);
if (InputInt(label, &value, options)) {
if (value == defaultValue) {
CVarClear(cvarName);
} else {
CVarSetInteger(cvarName, value);
}
CVarSetInteger(cvarName, value);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(cvarName);
dirty = true;
@ -972,16 +952,11 @@ bool CVarColorPicker(const char* label, const char* cvarName, Color_RGBA8 defaul
UIWidgets::CheckboxOptions({ { .tooltip = "Prevents this color from being changed" } }).Color(themeColor));
}
if (changed) {
if (color.r == defaultColor.r && color.g == defaultColor.g && color.b == defaultColor.b &&
color.a == defaultColor.a) {
CVarClear(valueCVar.c_str());
} else {
color.r = (uint8_t)(colorVec.x * 255.0f);
color.g = (uint8_t)(colorVec.y * 255.0f);
color.b = (uint8_t)(colorVec.z * 255.0f);
color.a = (uint8_t)(colorVec.w * 255.0f);
CVarSetColor(valueCVar.c_str(), color);
}
color.r = (uint8_t)(colorVec.x * 255.0f);
color.g = (uint8_t)(colorVec.y * 255.0f);
color.b = (uint8_t)(colorVec.z * 255.0f);
color.a = (uint8_t)(colorVec.w * 255.0f);
CVarSetColor(valueCVar.c_str(), color);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(valueCVar.c_str());
changed = true;
@ -1056,11 +1031,7 @@ bool CVarRadioButton(const char* text, const char* cvarName, int32_t id, const R
int val = CVarGetInteger(cvarName, options.defaultIndex);
PushStyleCheckbox(options.color);
if (ImGui::RadioButton(make_invisible.c_str(), id == val)) {
if (id == options.defaultIndex) {
CVarClear(cvarName);
} else {
CVarSetInteger(cvarName, id);
}
CVarSetInteger(cvarName, id);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ret = true;
}

18
soh/soh/SohGui/UIWidgets.hpp
View file

@ -880,11 +880,7 @@ bool CVarCombobox(const char* label, const char* cvarName, const std::unordered_
bool dirty = false;
int32_t value = CVarGetInteger(cvarName, options.defaultIndex);
if (Combobox<T>(label, &value, comboMap, options)) {
if (value == options.defaultIndex) {
CVarClear(cvarName);
} else {
CVarSetInteger(cvarName, value);
}
CVarSetInteger(cvarName, value);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(cvarName);
dirty = true;
@ -898,11 +894,7 @@ bool CVarCombobox(const char* label, const char* cvarName, const std::vector<con
bool dirty = false;
int32_t value = CVarGetInteger(cvarName, options.defaultIndex);
if (Combobox<T>(label, &value, comboVector, options)) {
if (value == options.defaultIndex) {
CVarClear(cvarName);
} else {
CVarSetInteger(cvarName, value);
}
CVarSetInteger(cvarName, value);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(cvarName);
dirty = true;
@ -916,11 +908,7 @@ bool CVarCombobox(const char* label, const char* cvarName, const char* (&comboAr
bool dirty = false;
int32_t value = CVarGetInteger(cvarName, options.defaultIndex);
if (Combobox<T>(label, &value, comboArray, options)) {
if (value == options.defaultIndex) {
CVarClear(cvarName);
} else {
CVarSetInteger(cvarName, value);
}
CVarSetInteger(cvarName, value);
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
ShipInit::Init(cvarName);
dirty = true;