[PATCH 7/7] toytoolkit: Make toytoolkit use state_set related calls.

antognolli at gmail.com antognolli at gmail.com
Fri Jul 19 12:42:49 PDT 2013


From: Rafael Antognolli <rafael.antognolli at intel.com>

Since there's no more surface_set_maximized and surface_set_fullscreen,
the toytoolkit must use the new state_set almost equivalent calls.
---
 clients/xdg_window.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/clients/xdg_window.c b/clients/xdg_window.c
index af8186e..b9c1ecc 100644
--- a/clients/xdg_window.c
+++ b/clients/xdg_window.c
@@ -3949,9 +3949,9 @@ window_set_fullscreen(struct window *window, int fullscreen)
 			window->saved_allocation = window->main_surface->allocation;
 		}
 		window->type = TYPE_FULLSCREEN;
-		xdg_surface_set_fullscreen(window->shell_surface,
-						window->fullscreen_method,
-						0, NULL);
+		xdg_surface_state_set_fullscreen(window->shell_surface,
+						 window->fullscreen_method, 0,
+						 NULL);
 		window_defer_redraw_until_configure (window);
 	} else {
 		if (window->saved_type == TYPE_MAXIMIZED) {
@@ -3991,11 +3991,12 @@ window_set_maximized(struct window *window, int maximized)
 
 	if (window->type == TYPE_TOPLEVEL) {
 		window->saved_allocation = window->main_surface->allocation;
-		xdg_surface_set_maximized(window->shell_surface, NULL);
+		xdg_surface_state_set_maximized(window->shell_surface, NULL);
 		window->type = TYPE_MAXIMIZED;
 		window_defer_redraw_until_configure(window);
 	} else if (window->type == TYPE_FULLSCREEN) {
-		xdg_surface_set_maximized(window->shell_surface, NULL);
+		xdg_surface_state_unset_fullscreen(window->shell_surface);
+		xdg_surface_state_set_maximized(window->shell_surface, NULL);
 		window->type = TYPE_MAXIMIZED;
 		window_defer_redraw_until_configure(window);
 	} else {
-- 
1.7.11.7



More information about the wayland-devel mailing list