Attachment 82374 Details for Bug 66793 – Move conditions around to get desired behavior

[patch] Move conditions around to get desired behavior

no-maximize-move.patch (text/plain), 1.28 KB, created by Kristian Høgsberg on 2013-07-13 04:04:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2013-07-13 04:04:41 UTC

Size: 1.28 KB

patch

obsolete

>commit 3c9d96768859a7841d415df936dec9941d0f965c
>Author: Rob Bradford <rob@linux.intel.com>
>Date:   Thu Jul 11 10:35:55 2013 +0100
>
>    window: Allow popup menu when the window is maximised
>    
>    https://bugs.freedesktop.org/show_bug.cgi?id=66793
>
>diff --git a/clients/window.c b/clients/window.c
>index cff7102..457479d 100644
>--- a/clients/window.c
>+++ b/clients/window.c
>@@ -2553,7 +2553,7 @@ frame_button_handler(struct widget *widget,
> 	struct display *display = window->display;
> 	int location;
> 
>-	if (window->type != TYPE_TOPLEVEL)
>+	if (state != WL_POINTER_BUTTON_STATE_PRESSED)
> 		return;
> 
> 	location = theme_get_location(display->theme, input->sx, input->sy,
>@@ -2563,7 +2563,7 @@ frame_button_handler(struct widget *widget,
> 				      THEME_FRAME_MAXIMIZED : 0);
> 
> 	if (window->display->shell && button == BTN_LEFT &&
>-	    state == WL_POINTER_BUTTON_STATE_PRESSED) {
>+	    window->type == TYPE_TOPLEVEL) {
> 		switch (location) {
> 		case THEME_LOCATION_TITLEBAR:
> 			if (!window->shell_surface)
>@@ -2592,7 +2592,8 @@ frame_button_handler(struct widget *widget,
> 			break;
> 		}
> 	} else if (button == BTN_RIGHT &&
>-		   state == WL_POINTER_BUTTON_STATE_PRESSED) {
>+		   (window->type == TYPE_TOPLEVEL ||
>+		    window->type == TYPE_MAXIMIZED)) {
> 		window_show_frame_menu(window, input, time);
> 	}
> }

Actions: View | Splinter Review

Attachments on bug 66793: 82374

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.