Remove the weston_view.geometry.width/height fields
This has a couple of additional implications for the internal weston API:
1) weston_view_configure no longer exists. Use weston_view_set_position
instead.
2) The weston_surface.configure callback no longer takes a width and
height. If you need these, surface.width/height are set before
configure is called. If you need to know when the width/height
changes, you must track that yourself.
This commit is contained in:
committed by
Kristian Høgsberg
parent
fdca95c7db
commit
918f2dd4cf
@@ -38,7 +38,9 @@ surface_to_from_global(void *data)
|
||||
assert(surface);
|
||||
view = weston_view_create(surface);
|
||||
assert(view);
|
||||
weston_view_configure(view, 5, 10, 50, 50);
|
||||
surface->width = 50;
|
||||
surface->height = 50;
|
||||
weston_view_set_position(view, 5, 10);
|
||||
weston_view_update_transform(view);
|
||||
|
||||
weston_view_to_global_float(view, 33, 22, &x, &y);
|
||||
|
||||
@@ -38,7 +38,9 @@ surface_transform(void *data)
|
||||
assert(surface);
|
||||
view = weston_view_create(surface);
|
||||
assert(view);
|
||||
weston_view_configure(view, 100, 100, 200, 200);
|
||||
surface->width = 200;
|
||||
surface->height = 200;
|
||||
weston_view_set_position(view, 100, 100);
|
||||
weston_view_update_transform(view);
|
||||
weston_view_to_global_float(view, 20, 20, &x, &y);
|
||||
|
||||
|
||||
+3
-4
@@ -75,7 +75,7 @@ notify_pointer_position(struct weston_test *test, struct wl_resource *resource)
|
||||
}
|
||||
|
||||
static void
|
||||
test_surface_configure(struct weston_surface *surface, int32_t sx, int32_t sy, int32_t width, int32_t height)
|
||||
test_surface_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
|
||||
{
|
||||
struct weston_test_surface *test_surface = surface->configure_private;
|
||||
struct weston_test *test = test_surface->test;
|
||||
@@ -84,9 +84,8 @@ test_surface_configure(struct weston_surface *surface, int32_t sx, int32_t sy, i
|
||||
wl_list_insert(&test->layer.view_list,
|
||||
&test_surface->view->layer_link);
|
||||
|
||||
weston_view_configure(test_surface->view,
|
||||
test_surface->x, test_surface->y,
|
||||
width, height);
|
||||
weston_view_set_position(test_surface->view,
|
||||
test_surface->x, test_surface->y);
|
||||
|
||||
weston_view_update_transform(test_surface->view);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user