Windows: Don't try to center a popup over a parent window when the popup is bigger than the parent.

Windows: Don't try to center a popup over a parent window when the popup is bigger than the parent.

BUG=120594
TEST=manual, see bug.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=129490

[Lei Zhang, 2012-03-28 03:37:27]

Found more regressions. :(

[Ben Goodger (Google), 2012-03-28 16:51:01]

LGTM

On Tue, Mar 27, 2012 at 8:37 PM, <thestig@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Message:
> Found more regressions. :(
>
> Description:
> Windows: Don't try to center a popup over a parent window when the popup is
> bigger than the parent.
>
> BUG=120594
> TEST=manual, see bug.
>
> Please review this at
https://chromiumcodereview.**appspot.com/9784012/<https://chromiumcodereview....
>
> SVN Base: svn://chrome-svn/chrome/trunk/**src/
>
> Affected files:
>  M     ui/base/win/hwnd_util.cc
>
>
> Index: ui/base/win/hwnd_util.cc
> ==============================**==============================**=======
> --- ui/base/win/hwnd_util.cc    (revision 129350)
> +++ ui/base/win/hwnd_util.cc    (working copy)
> @@ -13,7 +13,7 @@
>
>  namespace {
>
> -// Adjust the window to fit, returning true if the window was resized or
> moved.
> +// Adjust the window to fit.
>  void AdjustWindowToFit(HWND hwnd, const RECT& bounds, bool
> fit_to_monitor) {
>   if (fit_to_monitor) {
>     // Get the monitor.
> @@ -134,11 +134,19 @@
>       NOTREACHED() << "Unable to get default monitor";
>     }
>   }
> -  window_bounds.left = center_bounds.left +
> -      (center_bounds.right - center_bounds.left - pref.width()) / 2;
> +
> +  window_bounds.left = center_bounds.left;
> +  if (pref.width() < (center_bounds.right - center_bounds.left)) {
> +    window_bounds.left +=
> +        (center_bounds.right - center_bounds.left - pref.width()) / 2;
> +  }
>   window_bounds.right = window_bounds.left + pref.width();
> -  window_bounds.top = center_bounds.top +
> -      (center_bounds.bottom - center_bounds.top - pref.height()) / 2;
> +
> +  window_bounds.top = center_bounds.top;
> +  if (pref.height() < (center_bounds.bottom - center_bounds.top)) {
> +    window_bounds.top +=
> +        (center_bounds.bottom - center_bounds.top - pref.height()) / 2;
> +  }
>   window_bounds.bottom = window_bounds.top + pref.height();
>
>   // If we're centering a child window, we are positioning in client
>
>
>

[commit-bot: I haz the power, 2012-03-28 18:12:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thestig@chromium.org/9784012/1

[commit-bot: I haz the power, 2012-03-28 21:31:09]

Change committed as 129490