summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2013-07-11 10:35:55 +0100
committerKristian Høgsberg <krh@bitplanet.net>2013-07-12 23:56:18 -0400
commit3c9d96768859a7841d415df936dec9941d0f965c (patch)
tree10246aa53f467a462e6fff0596a8b15324509714
parent3cd1f860a0fddba217570522759e24fdd4ffcf9a (diff)
downloadweston-3c9d96768859a7841d415df936dec9941d0f965c.tar.gz
window: Allow popup menu when the window is maximised
https://bugs.freedesktop.org/show_bug.cgi?id=66793
-rw-r--r--clients/window.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/clients/window.c b/clients/window.c
index cff7102f..457479db 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);
}
}