layers: fix json to actually include numbers

[staging/windowmanager.git] / src / app.cpp

diff --git a/src/app.cpp b/src/app.cpp
index 6a7fc69..0a21635 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -43,12 +43,12 @@ using json = nlohmann::json;
 struct wm::area area_from_json(json const &j) {
    DB(j);
    return wm::area{
-      j["name"].get<std::string>(),
+      j["name"],
       {
-         get<int32_t>(j["width"]), get<int32_t>(j["height"]),
-         get<int32_t>(j["x"]), get<int32_t>(j["y"]),
+         j["width"], j["height"],
+         j["x"], j["y"],
       },
-      get<uint32_t>(j["zorder"]),
+      j["zorder"],
    };
 }
 
@@ -56,7 +56,7 @@ result<struct layout> layout_from_json(json const &j) {
    DB(j);
    auto &ja = j["areas"];
 
-   auto l = layout{j["name"].get<std::string>(), uint32_t(ja.size()), {}};
+   auto l = layout{j["name"], uint32_t(ja.size()), {}};
 
    if (ja.size() > layout::MAX_N_AREAS) {
       return Err<struct layout>("Invalid number of areas in layout");