mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-31 19:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1920 from Capostrophic/notation

Browse Source 
Actually fix General (%g) number formatting (bug #4463)
This commit is contained in:
Bret Curtis 2018-09-15 21:51:43 +02:00 committed by GitHub
commit 29ea72ed6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/interpreter/miscopcodes.hpp
View File

@ -65,23 +65,18 @@ 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
{ {
out << std::scientific << value; out << std::scientific << value;
mFormattedMessage += out.str(); mFormattedMessage += out.str();