Merge 121180 - views / Windows: A child window should be centered with respect to its parent, not t…

ui/base/win/hwnd_util.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "ui/base/win/hwnd_util.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace ui {
 
 namespace {
 
 // Adjust the window to fit, returning true if the window was resized or moved.
-bool AdjustWindowToFit(HWND hwnd, const RECT& bounds) {
-  // Get the monitor.
-  HMONITOR hmon = MonitorFromRect(&bounds, MONITOR_DEFAULTTONEAREST);
-  if (!hmon) {
-    NOTREACHED() << "Unable to find default monitor";
-    // No monitor available.
-    return false;
-  }
+void AdjustWindowToFit(HWND hwnd, const RECT& bounds, bool fit_to_monitor) {
+  if (fit_to_monitor) {
+    // Get the monitor.
+    HMONITOR hmon = MonitorFromRect(&bounds, MONITOR_DEFAULTTONEAREST);
+    if (hmon) {
+      MONITORINFO mi;
+      mi.cbSize = sizeof(mi);
+      GetMonitorInfo(hmon, &mi);
+      gfx::Rect window_rect(bounds);
+      gfx::Rect monitor_rect(mi.rcWork);
+      gfx::Rect new_window_rect = window_rect.AdjustToFit(monitor_rect);
+      if (!new_window_rect.Equals(window_rect)) {
+        // Window doesn't fit on monitor, move and possibly resize.
+        SetWindowPos(hwnd, 0, new_window_rect.x(), new_window_rect.y(),
+                     new_window_rect.width(), new_window_rect.height(),
+                     SWP_NOACTIVATE | SWP_NOZORDER);
+        return;
+      }
+      // Else fall through.
+    } else {
+      NOTREACHED() << "Unable to find default monitor";
+      // Fall through.
+    }
+  } // Else fall through.
 
-  MONITORINFO mi;
-  mi.cbSize = sizeof(mi);
-  GetMonitorInfo(hmon, &mi);
-  gfx::Rect window_rect(bounds);
-  gfx::Rect monitor_rect(mi.rcWork);
-  gfx::Rect new_window_rect = window_rect.AdjustToFit(monitor_rect);
-  if (!new_window_rect.Equals(window_rect)) {
-    // Window doesn't fit on monitor, move and possibly resize.
-    SetWindowPos(hwnd, 0, new_window_rect.x(), new_window_rect.y(),
-                 new_window_rect.width(), new_window_rect.height(),
+  // The window is not being fit to monitor, or the window fits on the monitor
+  // as is, or we have no monitor info; reset the bounds.
+  ::SetWindowPos(hwnd, 0, bounds.left, bounds.top,
+                 bounds.right - bounds.left, bounds.bottom - bounds.top,
                  SWP_NOACTIVATE | SWP_NOZORDER);
-    return true;
-  } else {
-    return false;
-  }
 }
 
 }  // namespace
 
 string16 GetClassName(HWND window) {
   // GetClassNameW will return a truncated result (properly null terminated) if
   // the given buffer is not large enough.  So, it is not possible to determine
   // that we got the entire class name if the result is exactly equal to the
   // size of the buffer minus one.
   DWORD buffer_size = MAX_PATH;
@@ skipping 47 matching lines @@
   HWND top_window = ::GetAncestor(window, GA_ROOT);
   if (!top_window)
     return false;
 
   HWND active_top_window = ::GetAncestor(::GetForegroundWindow(), GA_ROOT);
   return (top_window == active_top_window);
 }
 
 void CenterAndSizeWindow(HWND parent,
                          HWND window,
-                         const gfx::Size& pref,
-                         bool pref_is_client) {
+                         const gfx::Size& pref) {
   DCHECK(window && pref.width() > 0 && pref.height() > 0);
 
   // Calculate the ideal bounds.
   RECT window_bounds;
   RECT center_bounds = {0};
   if (parent) {
     // If there is a parent, center over the parents bounds.
     ::GetWindowRect(parent, &center_bounds);
   } else {
     // No parent. Center over the monitor the window is on.
@@ skipping 20 matching lines @@
   if (::GetWindowLong(window, GWL_STYLE) & WS_CHILD) {
     DCHECK(parent && ::GetParent(window) == parent);
     POINT topleft = { window_bounds.left, window_bounds.top };
     ::MapWindowPoints(HWND_DESKTOP, parent, &topleft, 1);
     window_bounds.left = topleft.x;
     window_bounds.top = topleft.y;
     window_bounds.right = window_bounds.left + pref.width();
     window_bounds.bottom = window_bounds.top + pref.height();
   }
 
-  // Get the WINDOWINFO for window. We need the style to calculate the size
-  // for the window.
-  WINDOWINFO win_info = {0};
-  win_info.cbSize = sizeof(WINDOWINFO);
-  GetWindowInfo(window, &win_info);
-
-  // Calculate the window size needed for the content size.
-
-  if (!pref_is_client ||
-      AdjustWindowRectEx(&window_bounds, win_info.dwStyle, FALSE,
-                         win_info.dwExStyle)) {
-    if (!AdjustWindowToFit(window, window_bounds)) {
-      // The window fits, reset the bounds.
-      SetWindowPos(window, 0, window_bounds.left, window_bounds.top,
-                   window_bounds.right - window_bounds.left,
-                   window_bounds.bottom - window_bounds.top,
-                   SWP_NOACTIVATE | SWP_NOZORDER);
-    }  // else case, AdjustWindowToFit set the bounds for us.
-  } else {
-    NOTREACHED() << "Unable to adjust window to fit";
-  }
+  AdjustWindowToFit(window, window_bounds, !parent);
 }
 
 void CheckWindowCreated(HWND hwnd) {
   if (!hwnd)
     LOG_GETLASTERROR(FATAL);
 }
 
 void ShowSystemMenu(HWND window, int screen_x, int screen_y) {
   UINT flags = TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD;
   if (base::i18n::IsRTL())
     flags |= TPM_RIGHTALIGN;
   HMENU system_menu = GetSystemMenu(window, FALSE);
   int command = TrackPopupMenu(system_menu, flags, screen_x, screen_y, 0,
                                window, NULL);
   if (command)
     SendMessage(window, WM_SYSCOMMAND, command, 0);
 }
 
 }  // namespace ui