<div dir="ltr"><div>This looks much more readable to me. Unnamed magic numbers are always confusing. </div><div> </div>Reviewed-by: Nils Chr. Brause <<a href="mailto:nilschrbrause@gmail.com">nilschrbrause@gmail.com</a>> </div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Aug 21, 2014 at 3:47 PM, Ondřej Majerech <<a href="mailto:majerech.o@gmail.com" target="_blank">majerech.o@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Ondřej Majerech <<a href="mailto:majerech.o@gmail.com">majerech.o@gmail.com</a>> --- desktop-shell/shell.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index e3abaad..02e180d 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -1884,13 +1884,20 @@ surface_resize(struct shell_surface *shsurf, struct weston_seat *seat, uint32_t edges) { struct weston_resize_grab *resize; + const unsigned resize_topbottom = + WL_SHELL_SURFACE_RESIZE_TOP | WL_SHELL_SURFACE_RESIZE_BOTTOM; + const unsigned resize_leftright = + WL_SHELL_SURFACE_RESIZE_LEFT | WL_SHELL_SURFACE_RESIZE_RIGHT; + const unsigned resize_any = resize_topbottom | resize_leftright; if (shsurf->grabbed || shsurf->state.fullscreen || shsurf->state.maximized) return 0; - if (edges == 0 || edges > 15 || - (edges & 3) == 3 || (edges & 12) == 12) + /* Check for invalid edge combinations. */ + if (edges == WL_SHELL_SURFACE_RESIZE_NONE || edges > resize_any || + (edges & resize_topbottom) == resize_topbottom || + (edges & resize_leftright) == resize_leftright) return 0; resize = malloc(sizeof *resize); -- 2.0.4 _______________________________________________ wayland-devel mailing list <a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a> </blockquote></div> </div>