mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-16 15:29:55 +00:00
Merge branch 'fix_cell_settings_type' into 'master'
Map SettingValueType Cell to float setting type (#7382) Closes #7382 See merge request OpenMW/openmw!3035
This commit is contained in:
commit
5b36ea0179
1 changed files with 6 additions and 5 deletions
|
@ -697,26 +697,27 @@ namespace MWGui
|
|||
float min, max;
|
||||
getSettingMinMax(scroller, min, max);
|
||||
value = min + (max - min) * value;
|
||||
if (valueType == "Float")
|
||||
Settings::get<float>(getSettingCategory(scroller), getSettingName(scroller)).set(value);
|
||||
else
|
||||
Settings::get<int>(getSettingCategory(scroller), getSettingName(scroller))
|
||||
.set(static_cast<int>(value));
|
||||
|
||||
if (valueType == "Cell")
|
||||
{
|
||||
Settings::get<float>(getSettingCategory(scroller), getSettingName(scroller)).set(value);
|
||||
std::stringstream ss;
|
||||
ss << std::fixed << std::setprecision(2) << value / Constants::CellSizeInUnits;
|
||||
valueStr = ss.str();
|
||||
}
|
||||
else if (valueType == "Float")
|
||||
{
|
||||
Settings::get<float>(getSettingCategory(scroller), getSettingName(scroller)).set(value);
|
||||
std::stringstream ss;
|
||||
ss << std::fixed << std::setprecision(2) << value;
|
||||
valueStr = ss.str();
|
||||
}
|
||||
else
|
||||
{
|
||||
Settings::get<int>(getSettingCategory(scroller), getSettingName(scroller))
|
||||
.set(static_cast<int>(value));
|
||||
valueStr = MyGUI::utility::toString(int(value));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue