From 34134e88f6c6b8b4d19fec53366d6e40a3303c6e Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 24 Oct 2022 09:59:45 +0200
Subject: a

---
 editor/app.cpp   | 25 ++++++++++++++++++++++---
 editor/imgui.cpp |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'editor')

diff --git a/editor/app.cpp b/editor/app.cpp
index d6884edb..878e4052 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -62,16 +62,35 @@ static bool parse_bool(StringView name, StringView str, bool def)
 
 int app::run_from_argv(const int argc, const char* const* const argv)
 {
-    fm_options opts;
+    fm_settings opts;
     {
         Corrade::Utility::Arguments args{};
-        args.addOption("vsync", "default")
-            .addOption("gpu-validation", "true")
+        args.addOption("vsync", "m")
+            .addOption("gpu-validation", "1")
+            .addOption("msaa", "1")
             .parse(argc, argv);
         opts.vsync = parse_tristate("--vsync", args.value<StringView>("vsync"), opts.vsync);
+        opts.msaa  = parse_bool("--msaa", args.value<StringView>("msaaa"), opts.msaa);
     }
     app application;
     return application.exec();
 }
 
+#ifdef _MSC_VER
+#include <cstdlib> // for __arg{c,v}
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wmain"
+#endif
+extern "C" int __stdcall WinMain(void*, void*, void*, int);
+
+extern "C" int __stdcall WinMain(void*, void*, void*, int)
+{
+    return main(__argc, __argv);
+}
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
+#endif
+
 } // namespace floormat
diff --git a/editor/imgui.cpp b/editor/imgui.cpp
index f6a3db1e..aea34ae9 100644
--- a/editor/imgui.cpp
+++ b/editor/imgui.cpp
@@ -232,7 +232,7 @@ void app::draw_cursor_tile()
     const auto size = ImGui::CalcTextSize(buf);
     const auto window_size = M->window_size();
 
-    ImGui::SetNextWindowPos({window_size[0]/2 - size.x/2, 3});
+    ImGui::SetNextWindowPos({window_size[0]*.5f - size.x/2, 3});
     ImGui::SetNextWindowSize(size);
     if (auto flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoInputs |
                      ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBackground;
-- 
cgit v1.2.3