Adding proper dragging behavior for L/R maximized windows.

ash/wm/frame_painter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/logging.h"  // DCHECK
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/screen.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 // TODO(jamescook): Border is specified to be a single pixel overlapping
 // the web content and may need to be built into the shadow layers instead.
 const int kBorderThickness = 0;
 // Space between left edge of window and popup window icon.
 const int kIconOffsetX = 4;
@@ skipping 200 matching lines @@
   // fullscreen, as it can't be resized in those states.
   int resize_border =
       frame_->IsMaximized() || frame_->IsFullscreen() ? 0 :
       kResizeInsideBoundsSize;
   int frame_component = view->GetHTComponentForFrame(point,
                                                      resize_border,
                                                      resize_border,
                                                      kResizeAreaCornerSize,
                                                      kResizeAreaCornerSize,
                                                      can_ever_resize);
+  frame_component = AdjustFrameHitCodeForMaximizedModes(frame_component);
   if (frame_component != HTNOWHERE)
     return frame_component;
 
   int client_component = frame_->client_view()->NonClientHitTest(point);
   if (client_component != HTNOWHERE)
     return client_component;
 
   // Then see if the point is within any of the window controls.
   if (close_button_->visible() &&
       close_button_->GetMirroredBounds().Contains(point))
@@ skipping 328 matching lines @@
   // Single browser window is very transparent.
   if (UseSoloWindowHeader())
     return kSoloWindowOpacity;
 
   // Otherwise, change transparency based on window activation status.
   if (header_mode == ACTIVE)
     return kActiveWindowOpacity;
   return kInactiveWindowOpacity;
 }
 
+int FramePainter::AdjustFrameHitCodeForMaximizedModes(int hit_code) {
+  if (hit_code != HTNOWHERE && wm::IsWindowNormal(window_) &&
+      GetRestoreBoundsInScreen(window_)) {
+    // When there is a restore rectangle, a left/right maximized window might
+    // be active.
+    gfx::Rect bounds = window_->bounds();

[sky, 2012/09/06 19:45:11]

const gfx::Rect& here and next line.

And you need to convert coordinates, or use frame_->GetWindowBoundsInScreen().

[Mr4D (OOO till 08-26), 2012/09/06 23:16:13]

Done.

+    gfx::Rect screen = gfx::Screen::GetDisplayMatching(bounds).work_area();
+    if (bounds.y() == screen.y() && bounds.bottom() == screen.bottom()) {
+      // The window is probably either left or right maximized.
+      if (bounds.x() == screen.x()) {
+        // It is left maximized and we can only allow a right resize.
+        return (hit_code == HTBOTTOMRIGHT ||
+                hit_code == HTTOPRIGHT ||
+                hit_code == HTRIGHT) ? HTRIGHT : HTNOWHERE;
+      } else if (bounds.right() == screen.right()) {
+        // It is right maximized and we can only allow a left resize.
+        return (hit_code == HTBOTTOMLEFT ||
+                hit_code == HTTOPLEFT ||
+                hit_code == HTLEFT) ? HTLEFT : HTNOWHERE;
+      }
+    } else if (bounds.x() == screen.x() &&
+               bounds.right() == screen.right()) {
+      // If horizontal fill mode is activated we don't allow a left/right
+      // resizing.
+      if (bounds.right() == screen.right()) {

[sky, 2012/09/06 19:45:11]

Shouldn't this check y coordinates (620 checks x coordinates).

[Mr4D (OOO till 08-26), 2012/09/06 23:16:13]

Actually - I don't think that any additional check is needed here. Done.

+        if (hit_code == HTTOPRIGHT ||
+            hit_code == HTTOP ||
+            hit_code == HTTOPLEFT)
+          return HTTOP;
+        return (hit_code == HTBOTTOMRIGHT ||
+                hit_code == HTBOTTOM ||
+                hit_code == HTBOTTOMLEFT) ? HTBOTTOM : HTNOWHERE;
+      }
+    }
+  }
+  return hit_code;
+}
+
 // static
 bool FramePainter::UseSoloWindowHeader() {
   if (!instances_)
     return false;  // Return value shouldn't matter.
 
   aura::Window* window = NULL;
   for (std::set<FramePainter*>::const_iterator it = instances_->begin();
        it != instances_->end();
        ++it) {
     // The window needs to be a 'normal window'. To exclude constrained windows
@@ skipping 19 matching lines @@
   for (std::set<FramePainter*>::const_iterator it = instances_->begin();
        it != instances_->end();
        ++it) {
     FramePainter* painter = *it;
     if (IsVisibleNormalWindow(painter->window_))
       painter->frame_->non_client_view()->SchedulePaint();
   }
 }
 
 }  // namespace ash