Code Review
/
apps
/
agl-service-windowmanager-2017.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add horizontal layer
[apps/agl-service-windowmanager-2017.git]
/
src
/
window_manager.cpp
diff --git
a/src/window_manager.cpp
b/src/window_manager.cpp
index
c44210f
..
dd757d6
100644
(file)
--- a/
src/window_manager.cpp
+++ b/
src/window_manager.cpp
@@
-184,12
+184,12
@@
int WindowManager::init()
// This protocol needs the output, so lets just add our mapping here...
this->controller->add_proxy_to_id_mapping(
// This protocol needs the output, so lets just add our mapping here...
this->controller->add_proxy_to_id_mapping(
- this->outputs.
back
()->proxy.get(),
+ this->outputs.
front
()->proxy.get(),
wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
- this->outputs.
back
()->proxy.get())));
+ this->outputs.
front
()->proxy.get())));
// Create screen
// Create screen
- this->controller->create_screen(this->outputs.
back
()->proxy.get());
+ this->controller->create_screen(this->outputs.
front
()->proxy.get());
// Set display to controller
this->controller->display = this->display;
// Set display to controller
this->controller->display = this->display;
@@
-574,6
+574,8
@@
void WindowManager::send_event(char const *evname, char const *label, char const
*/
void WindowManager::surface_created(uint32_t surface_id)
{
*/
void WindowManager::surface_created(uint32_t surface_id)
{
+ this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE);
+
auto layer_id = this->layers.get_layer_id(surface_id);
if (!layer_id)
{
auto layer_id = this->layers.get_layer_id(surface_id);
if (!layer_id)
{
@@
-742,8
+744,6
@@
void WindowManager::surface_set_layout(int surface_id, const std::string& area)
layer_id);
// set destination to the display rectangle
layer_id);
// set destination to the display rectangle
- s->set_source_rectangle(0, 0, w, h);
- this->layout_commit();
s->set_destination_rectangle(x, y, w, h);
// update area information
s->set_destination_rectangle(x, y, w, h);
// update area information
@@
-1133,6
+1133,10
@@
WMError WindowManager::setInvisibleTask(const std::string &role, bool split)
{
continue;
}
{
continue;
}
+ if (l.second.role == "homescreen")
+ {
+ continue;
+ }
HMI_DEBUG("wm", "debug: main %d , sub : %d", l.second.state.main, l.second.state.sub);
if (l.second.state.main != -1)
{
HMI_DEBUG("wm", "debug: main %d , sub : %d", l.second.state.main, l.second.state.sub);
if (l.second.state.main != -1)
{
@@
-1292,6
+1296,7
@@
WMError WindowManager::doEndDraw(unsigned req_num)
HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
//this->lm_enddraw(act.role.c_str());
}
HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
//this->lm_enddraw(act.role.c_str());
}
+ this->layout_commit();
// Change current state
this->changeCurrentState(req_num);
// Change current state
this->changeCurrentState(req_num);
@@
-1771,12
+1776,12
@@
const char* WindowManager::kDefaultOldRoleDb = "{ \
*/
void controller_hooks::surface_created(uint32_t surface_id)
{
*/
void controller_hooks::surface_created(uint32_t surface_id)
{
- this->
app
->surface_created(surface_id);
+ this->
wmgr
->surface_created(surface_id);
}
void controller_hooks::surface_removed(uint32_t surface_id)
{
}
void controller_hooks::surface_removed(uint32_t surface_id)
{
- this->
app
->surface_removed(surface_id);
+ this->
wmgr
->surface_removed(surface_id);
}
void controller_hooks::surface_visibility(uint32_t /*surface_id*/,
}
void controller_hooks::surface_visibility(uint32_t /*surface_id*/,