diff options
author | Tony Crisci <tony@dubstepdish.com> | 2017-12-03 14:22:06 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-03 14:22:06 -0500 |
commit | 823f6ee1229ee1c3613a293fffd017ad3865f3ce (patch) | |
tree | 02422e12285a768d24c18612f039eaede1692e83 /sway/desktop | |
parent | basic wl-shell (diff) | |
parent | Merge pull request #1491 from acrisci/refactor/dimension-to-size (diff) | |
download | sway-823f6ee1229ee1c3613a293fffd017ad3865f3ce.tar.gz sway-823f6ee1229ee1c3613a293fffd017ad3865f3ce.tar.zst sway-823f6ee1229ee1c3613a293fffd017ad3865f3ce.zip |
Merge branch 'wlroots' into feature/wl-shell
Diffstat (limited to 'sway/desktop')
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 45e443fc..2545d1a6 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
@@ -28,7 +28,7 @@ static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) { | |||
28 | } | 28 | } |
29 | } | 29 | } |
30 | 30 | ||
31 | static void set_dimensions(struct sway_view *view, int width, int height) { | 31 | static void set_size(struct sway_view *view, int width, int height) { |
32 | if (!assert_xdg(view)) { | 32 | if (!assert_xdg(view)) { |
33 | return; | 33 | return; |
34 | } | 34 | } |
@@ -86,7 +86,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { | |||
86 | } | 86 | } |
87 | sway_view->type = SWAY_XDG_SHELL_V6_VIEW; | 87 | sway_view->type = SWAY_XDG_SHELL_V6_VIEW; |
88 | sway_view->iface.get_prop = get_prop; | 88 | sway_view->iface.get_prop = get_prop; |
89 | sway_view->iface.set_dimensions = set_dimensions; | 89 | sway_view->iface.set_size = set_size; |
90 | sway_view->wlr_xdg_surface_v6 = xdg_surface; | 90 | sway_view->wlr_xdg_surface_v6 = xdg_surface; |
91 | sway_view->sway_xdg_surface_v6 = sway_surface; | 91 | sway_view->sway_xdg_surface_v6 = sway_surface; |
92 | sway_view->surface = xdg_surface->surface; | 92 | sway_view->surface = xdg_surface->surface; |