Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes from topic '15921'
[apps/agl-service-windowmanager.git]
/
src
/
wayland_ivi_wm.cpp
diff --git
a/src/wayland_ivi_wm.cpp
b/src/wayland_ivi_wm.cpp
index
522295d
..
8b04c64
100644
(file)
--- a/
src/wayland_ivi_wm.cpp
+++ b/
src/wayland_ivi_wm.cpp
@@
-435,11
+435,6
@@
void layer::set_visibility(uint32_t visibility)
ivi_wm_set_layer_visibility(this->parent->proxy.get(), this->id, visibility);
}
ivi_wm_set_layer_visibility(this->parent->proxy.get(), this->id, visibility);
}
-void layer::set_source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height)
-{
- ivi_wm_set_layer_source_rectangle(this->parent->proxy.get(), this->id, x, y, width, height);
-}
-
void layer::set_destination_rectangle(int32_t x, int32_t y,
int32_t width, int32_t height)
{
void layer::set_destination_rectangle(int32_t x, int32_t y,
int32_t width, int32_t height)
{
@@
-536,6
+531,11
@@
void controller::create_screen(struct wl_output *output)
this->screen = std::make_unique<struct screen>(0, this, output);
}
this->screen = std::make_unique<struct screen>(0, this, output);
}
+void controller::get_surface_properties(uint32_t surface_id, int param)
+{
+ ivi_wm_surface_get(this->proxy.get(), surface_id, param);
+}
+
void controller::layer_created(uint32_t id)
{
HMI_DEBUG("wm", "compositor::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
void controller::layer_created(uint32_t id)
{
HMI_DEBUG("wm", "compositor::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
@@
-596,6
+596,7
@@
void controller::surface_size_changed(uint32_t id, int32_t width,
HMI_DEBUG("wm", "compositor::surface %s @ %d w %i h %i", __func__, id,
width, height);
this->sprops[id].size = size{uint32_t(width), uint32_t(height)};
HMI_DEBUG("wm", "compositor::surface %s @ %d w %i h %i", __func__, id,
width, height);
this->sprops[id].size = size{uint32_t(width), uint32_t(height)};
+ this->surfaces[id]->set_source_rectangle(0, 0, width, height);
}
void controller::surface_added_to_layer(uint32_t layer_id, uint32_t surface_id)
}
void controller::surface_added_to_layer(uint32_t layer_id, uint32_t surface_id)