mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 10:50:29 -05:00
Code Issues Projects Releases Wiki Activity

Change precision of float sliders (#1609)

Browse Source 
* Change precision of float sliders

* Formatting

* Don't round non-percentage sliders
This commit is contained in:
GaryOderNichts 2022-09-28 01:30:50 +02:00 committed by GitHub
parent 677c4845f6
commit c6a875eb5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
soh/soh/UIWidgets.cpp
View File

@ -301,10 +301,11 @@ namespace UIWidgets {
void EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton) { void EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton) {
float val = CVar_GetFloat(cvarName, defaultValue); float val = CVar_GetFloat(cvarName, defaultValue);
if (!isPercentage) if (!isPercentage) {
ImGui::Text(text, val); ImGui::Text(text, val);
else } else {
ImGui::Text(text, static_cast<int>(100 * val)); ImGui::Text(text, static_cast<int>(100 * val));
}
Spacer(0); Spacer(0);
@ -312,10 +313,11 @@ namespace UIWidgets {
std::string MinusBTNName = " - ##"; std::string MinusBTNName = " - ##";
MinusBTNName += cvarName; MinusBTNName += cvarName;
if (ImGui::Button(MinusBTNName.c_str())) { if (ImGui::Button(MinusBTNName.c_str())) {
if (!isPercentage) if (!isPercentage) {
val -= 0.1f; val -= 0.1f;
else } else {
val -= 0.01f; val -= 0.01f;
}
CVar_SetFloat(cvarName, val); CVar_SetFloat(cvarName, val);
SohImGui::RequestCvarSaveOnNextTick(); SohImGui::RequestCvarSaveOnNextTick();
} }
@ -331,9 +333,12 @@ namespace UIWidgets {
ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f); ImGui::PushItemWidth(ImGui::GetWindowSize().x - 79.0f);
#endif #endif
} }
if (ImGui::SliderFloat(id, &val, min, max, format)) if (ImGui::SliderFloat(id, &val, min, max, format)) {
{ if (isPercentage) {
CVar_SetFloat(cvarName, val); CVar_SetFloat(cvarName, roundf(val * 100) / 100);
} else {
CVar_SetFloat(cvarName, val);
}
SohImGui::RequestCvarSaveOnNextTick(); SohImGui::RequestCvarSaveOnNextTick();
} }
if (PlusMinusButton) { if (PlusMinusButton) {
@ -345,24 +350,23 @@ namespace UIWidgets {
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f); ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
if (ImGui::Button(PlusBTNName.c_str())) { if (ImGui::Button(PlusBTNName.c_str())) {
if (!isPercentage) if (!isPercentage) {
val += 0.1f; val += 0.1f;
else } else {
val += 0.01f; val += 0.01f;
}
CVar_SetFloat(cvarName, val); CVar_SetFloat(cvarName, val);
SohImGui::RequestCvarSaveOnNextTick(); SohImGui::RequestCvarSaveOnNextTick();
} }
} }
if (val < min) if (val < min) {
{
val = min; val = min;
CVar_SetFloat(cvarName, val); CVar_SetFloat(cvarName, val);
SohImGui::RequestCvarSaveOnNextTick(); SohImGui::RequestCvarSaveOnNextTick();
} }
if (val > max) if (val > max) {
{
val = max; val = max;
CVar_SetFloat(cvarName, val); CVar_SetFloat(cvarName, val);
SohImGui::RequestCvarSaveOnNextTick(); SohImGui::RequestCvarSaveOnNextTick();