summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 04:30:02 +0000
committermgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 04:30:02 +0000
commitbc71f4e91c7117d38644fa77d179fca23f1de5fb (patch)
tree750b4fad23180c6cdc1c1cfeaa5e64184a5ae69f
parent5b3e88a0e4aaecdebb16af89f1e24635973a1f4c (diff)
downloadchromium_src-bc71f4e91c7117d38644fa77d179fca23f1de5fb.zip
chromium_src-bc71f4e91c7117d38644fa77d179fca23f1de5fb.tar.gz
chromium_src-bc71f4e91c7117d38644fa77d179fca23f1de5fb.tar.bz2
Linux Aura: A window is not considered maximized if it is half-screened.
DesktopRootWindowHostX11::IsMaximized only returns true if the window is both vertically and horizontally maximized. This avoids half-screened windows behaving as if they were maximized (having non-resizable borders, having a restore button instead of maximize, and on Unity having missing caption buttons). BUG=322378 TEST=Drag a Chrome window to the left or right side of screen, so that it snaps to fill half of the screen. Observe that it is still resizable, has rounded corners, a minimize, maximize (not restore) and close button. Review URL: https://codereview.chromium.org/110883009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240012 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
index 7994e06..545e0cd 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
@@ -495,7 +495,7 @@ void DesktopRootWindowHostX11::Restore() {
}
bool DesktopRootWindowHostX11::IsMaximized() const {
- return (HasWMSpecProperty("_NET_WM_STATE_MAXIMIZED_VERT") ||
+ return (HasWMSpecProperty("_NET_WM_STATE_MAXIMIZED_VERT") &&
HasWMSpecProperty("_NET_WM_STATE_MAXIMIZED_HORZ"));
}