aboutsummaryrefslogtreecommitdiffstats
path: root/src/window_manager.cpp
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-08-20 18:35:53 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-08-20 18:35:53 +0900
commit27e4f2d7810666d86bcb525d0e7e513e70c5f021 (patch)
tree62ae812335ebc4fee0d63086e1ae29f1b52b84bc /src/window_manager.cpp
parentc22f1a8f722b2249d62bfebb0a035556aa84b0cd (diff)
Add initialize of Layout Manager
Layout Manager is not suitable in this case... but this name is set be architecture... Change-Id: Ia1612f243dcae2af229357cc982918b2b5ea7d7d Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat (limited to 'src/window_manager.cpp')
-rw-r--r--src/window_manager.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 4e41d40..bb8b073 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -126,19 +126,19 @@ WindowManager::WindowManager(wl::display *d)
id_alloc{},
pending_events(false)
{
- char const *path_layers_json = getenv("AFM_APP_INSTALL_DIR");
- string path;
- if (!path_layers_json)
+ const char *path = getenv("AFM_APP_INSTALL_DIR");
+ string lm_setting_path = path;
+ if (!path)
{
HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
- path = string(path_layers_json);
}
else
{
- path = string(path_layers_json) + string("/etc/layers.json");
+ lm_setting_path += "/etc/layers_setting.json";
}
+ this->lm = std::make_shared<LayoutManager>(lm_setting_path);
- try
+/* try
{
{
auto l = load_layer_map(path.c_str());
@@ -155,7 +155,7 @@ WindowManager::WindowManager(wl::display *d)
catch (std::exception &e)
{
HMI_ERROR("wm", "Loading of configuration failed: %s", e.what());
- }
+ } */
}
int WindowManager::init()