mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-21 10:41:33 +00:00
Merge pull request #1920 from Capostrophic/notation
Actually fix General (%g) number formatting (bug #4463)
This commit is contained in:
commit
29ea72ed6c
1 changed files with 6 additions and 11 deletions
|
@ -65,21 +65,16 @@ namespace Interpreter
|
||||||
}
|
}
|
||||||
else if (notation == ShortestNotation)
|
else if (notation == ShortestNotation)
|
||||||
{
|
{
|
||||||
std::string scientific;
|
out << value;
|
||||||
std::string fixed;
|
std::string standard = out.str();
|
||||||
|
|
||||||
out << std::scientific << value;
|
|
||||||
|
|
||||||
scientific = out.str();
|
|
||||||
|
|
||||||
out.str(std::string());
|
out.str(std::string());
|
||||||
out.clear();
|
out.clear();
|
||||||
|
|
||||||
out << std::fixed << value;
|
out << std::scientific << value;
|
||||||
|
std::string scientific = out.str();
|
||||||
|
|
||||||
fixed = out.str();
|
mFormattedMessage += standard.length() < scientific.length() ? standard : scientific;
|
||||||
|
|
||||||
mFormattedMessage += fixed.length() < scientific.length() ? fixed : scientific;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue