Merge branch 'master' of https://github.com/kcleal/gw

Author: kcleal

.github/workflows/main.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  version: 1.1.2
+  version: 1.1.3
 
 jobs:
   mingw:

Makefile

@@ -1,5 +1,5 @@
 TARGET = gw
-VERSION = "1.1.3"
+VERSION = "1.1.4"
 .PHONY: default all debug clean
 default: $(TARGET)
 all: default

src/drawing.cpp

@@ -2025,7 +2025,7 @@ namespace Drawing {
     }
 
 
-    std::string floatToStringCommas(float num, int precision=1) {
+    std::string floatToStringCommas(double num, int precision=1) {
         std::stringstream stream;
         std::string s;
         int n;
@@ -2059,7 +2059,6 @@ namespace Drawing {
             a = "0";
             return;
         }
-//        int rounding = std::min(std::ceil(std::log10(num)), std::ceil(std::log10(regionLen)));
         int rounding = std::ceil(std::log10(regionLen));
         double d;
         switch (rounding) {
@@ -2074,7 +2073,6 @@ namespace Drawing {
                 d = (double)num / 1e3;
                 d = std::floor(d * 10) / 10;
                 a = floatToStringCommas((float)d, 1);
-//                a = Utils::removeZeros((float)d);
                 a += " kb";
                 break;
             case 5:

src/main.cpp

@@ -30,7 +30,7 @@
     #include <emscripten.h>
 #endif
 
-// note to developer - update version in workflows/main.yml, menu.cpp, term_out.cpp, and deps/gw.desktop, and installers .md in docs (post release)
+// note to developer - update version in Makefile, workflows/main.yml, menu.cpp, term_out.cpp, and deps/gw.desktop, and installers .md in docs (post release)
 const char GW_VERSION [7] = "1.1.3";
 // skia context has to be managed from global space to work
 GrDirectContext *sContext = nullptr;