aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-06-20 14:59:11 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-06-20 14:59:11 +0900
commit0f8ae2ce27e185fb37cf6bdde6644807c32abf73 (patch)
treef2c8ae4a8adcd440e1c07b713056d50502cf56e4
parent66318aeba09afafc5cc2a476d1db4d5765f38d58 (diff)
Remove try_layout API
This API is not used anymore Change-Id: Iee66afbeb2782dc5f4ce24f4af3e4486f8b14fca Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
-rw-r--r--src/app.cpp19
-rw-r--r--src/app.hpp6
2 files changed, 1 insertions, 24 deletions
diff --git a/src/app.cpp b/src/app.cpp
index c9bb103..f509be0 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -649,15 +649,6 @@ WMError App::setInvisibleTask(const std::string &role, bool split)
if (state.main == -1)
{
HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
- //state = LayoutState{*surface_id};
- /* this->try_layout(
- state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
- HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
- //this->surface_set_layout(*surface_id);
- state = nl;
-
- //compositor::rect area_rect = this->area_info[*surface_id];
- }); */
}
else
{
@@ -1530,16 +1521,6 @@ bool App::can_split(struct LayoutState const &state, int new_id)
return false;
}
-void App::try_layout(struct LayoutState & /*state*/,
- struct LayoutState const &new_layout,
- std::function<void(LayoutState const &nl)> apply)
-{
- if (this->policy.layout_is_valid(new_layout))
- {
- apply(new_layout);
- }
-}
-
/**
* controller_hooks
*/
diff --git a/src/app.hpp b/src/app.hpp
index f2cc8a1..80a9142 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -270,8 +270,7 @@ struct App
WMError setSurfaceSize(unsigned surface, const std::string& area);
WMError changeCurrentState(unsigned req_num);
- void
- setTimer();
+ void setTimer();
void stopTimer();
void processNextRequest();
@@ -281,9 +280,6 @@ struct App
void deactivate(int id);
bool can_split(struct LayoutState const &state, int new_id);
- void try_layout(struct LayoutState &state,
- struct LayoutState const &new_layout,
- std::function<void(LayoutState const &nl)> apply);
private:
std::unordered_map<std::string, struct compositor::rect> area2size;