| Index: chrome/browser/ui/views/ash/window_positioner.cc
|
| diff --git a/chrome/browser/ui/views/ash/window_positioner.cc b/chrome/browser/ui/views/ash/window_positioner.cc
|
| deleted file mode 100644
|
| index 1e1e8e2d6180a91c3a23f17e1a7f352b1385089a..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/ui/views/ash/window_positioner.cc
|
| +++ /dev/null
|
| @@ -1,190 +0,0 @@
|
| -// 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 "chrome/browser/ui/views/ash/window_positioner.h"
|
| -
|
| -#include "ash/shell.h"
|
| -#include "ash/wm/window_cycle_controller.h"
|
| -#include "ash/wm/window_resizer.h"
|
| -#include "ash/wm/window_util.h"
|
| -#include "ui/aura/window.h"
|
| -#include "ui/aura/window_delegate.h"
|
| -#include "ui/compositor/layer.h"
|
| -#include "ui/gfx/screen.h"
|
| -
|
| -WindowPositioner::WindowPositioner()
|
| - : pop_position_offset_increment_x(0),
|
| - pop_position_offset_increment_y(0),
|
| - popup_position_offset_from_screen_corner_x(0),
|
| - popup_position_offset_from_screen_corner_y(0),
|
| - last_popup_position_x_(0),
|
| - last_popup_position_y_(0) {
|
| -}
|
| -
|
| -WindowPositioner::~WindowPositioner() {
|
| -}
|
| -
|
| -gfx::Rect WindowPositioner::GetPopupPosition(const gfx::Rect& old_pos) {
|
| - int grid = ash::Shell::GetInstance()->GetGridSize();
|
| - // Make sure that the grid has a minimum resolution of 10 pixels.
|
| - if (!grid) {
|
| - grid = 10;
|
| - } else {
|
| - while (grid < 10)
|
| - grid *= 2;
|
| - }
|
| - popup_position_offset_from_screen_corner_x = grid;
|
| - popup_position_offset_from_screen_corner_y = grid;
|
| - if (!pop_position_offset_increment_x) {
|
| - // When the popup position increment is , the last popup position
|
| - // was not yet initialized.
|
| - last_popup_position_x_ = popup_position_offset_from_screen_corner_x;
|
| - last_popup_position_y_ = popup_position_offset_from_screen_corner_y;
|
| - }
|
| - pop_position_offset_increment_x = grid;
|
| - pop_position_offset_increment_y = grid;
|
| - // We handle the Multi monitor support by retrieving the active window's
|
| - // work area.
|
| - aura::Window* window = ash::wm::GetActiveWindow();
|
| - const gfx::Rect work_area = window && window->IsVisible() ?
|
| - gfx::Screen::GetDisplayNearestWindow(window).work_area() :
|
| - gfx::Screen::GetPrimaryDisplay().work_area();
|
| - // Only try to reposition the popup when it is not spanning the entire
|
| - // screen.
|
| - if ((old_pos.width() + popup_position_offset_from_screen_corner_x >=
|
| - work_area.width()) ||
|
| - (old_pos.height() + popup_position_offset_from_screen_corner_y >=
|
| - work_area.height()))
|
| - return AlignPopupPosition(old_pos, work_area, grid);
|
| - const gfx::Rect result = SmartPopupPosition(old_pos, work_area, grid);
|
| - if (!result.IsEmpty())
|
| - return AlignPopupPosition(result, work_area, grid);
|
| - return NormalPopupPosition(old_pos, work_area);
|
| -}
|
| -
|
| -gfx::Rect WindowPositioner::NormalPopupPosition(
|
| - const gfx::Rect& old_pos,
|
| - const gfx::Rect& work_area) {
|
| - int w = old_pos.width();
|
| - int h = old_pos.height();
|
| - // Note: The 'last_popup_position' is checked and kept relative to the
|
| - // screen size. The offsetting will be done in the last step when the
|
| - // target rectangle gets returned.
|
| - bool reset = false;
|
| - if (last_popup_position_y_ + h > work_area.height() ||
|
| - last_popup_position_x_ + w > work_area.width()) {
|
| - // Popup does not fit on screen. Reset to next diagonal row.
|
| - last_popup_position_x_ -= last_popup_position_y_ -
|
| - popup_position_offset_from_screen_corner_x -
|
| - pop_position_offset_increment_x;
|
| - last_popup_position_y_ = popup_position_offset_from_screen_corner_y;
|
| - reset = true;
|
| - }
|
| - if (last_popup_position_x_ + w > work_area.width()) {
|
| - // Start again over.
|
| - last_popup_position_x_ = popup_position_offset_from_screen_corner_x;
|
| - last_popup_position_y_ = popup_position_offset_from_screen_corner_y;
|
| - reset = true;
|
| - }
|
| - int x = last_popup_position_x_;
|
| - int y = last_popup_position_y_;
|
| - if (!reset) {
|
| - last_popup_position_x_ += pop_position_offset_increment_x;
|
| - last_popup_position_y_ += pop_position_offset_increment_y;
|
| - }
|
| - return gfx::Rect(x + work_area.x(), y + work_area.y(), w, h);
|
| -}
|
| -
|
| -gfx::Rect WindowPositioner::SmartPopupPosition(
|
| - const gfx::Rect& old_pos,
|
| - const gfx::Rect& work_area,
|
| - int grid) {
|
| - const std::vector<aura::Window*> windows =
|
| - ash::WindowCycleController::BuildWindowList(NULL);
|
| -
|
| - std::vector<const gfx::Rect*> regions;
|
| - // Process the window list and check if we can bail immediately.
|
| - for (size_t i = 0; i < windows.size(); i++) {
|
| - // We only include opaque and visible windows.
|
| - if (windows[i] && windows[i]->IsVisible() && windows[i]->layer() &&
|
| - (!windows[i]->transparent() ||
|
| - windows[i]->layer()->GetTargetOpacity() == 1.0)) {
|
| - // When any window is maximized we cannot find any free space.
|
| - if (ash::wm::IsWindowMaximized(windows[i]) ||
|
| - ash::wm::IsWindowFullscreen(windows[i]))
|
| - return gfx::Rect(0, 0, 0, 0);
|
| - if (ash::wm::IsWindowNormal(windows[i]))
|
| - regions.push_back(&windows[i]->bounds());
|
| - }
|
| - }
|
| -
|
| - if (regions.empty())
|
| - return gfx::Rect(0, 0, 0, 0);
|
| -
|
| - int w = old_pos.width();
|
| - int h = old_pos.height();
|
| - int x_end = work_area.width() / 2;
|
| - int x, x_increment;
|
| - // We parse for a proper location on the screen. We do this in two runs:
|
| - // The first run will start from the left, parsing down, skipping any
|
| - // overlapping windows it will encounter until the popup's height can not
|
| - // be served anymore. Then the next grid position to the right will be
|
| - // taken, and the same cycle starts again. This will be repeated until we
|
| - // hit the middle of the screen (or we find a suitable location).
|
| - // In the second run we parse beginning from the right corner downwards and
|
| - // then to the left.
|
| - // When no location was found, an empty rectangle will be returned.
|
| - for (int run = 0; run < 2; run++) {
|
| - if (run == 0) { // First run: Start left, parse right till mid screen.
|
| - x = 0;
|
| - x_increment = pop_position_offset_increment_x;
|
| - } else { // Second run: Start right, parse left till mid screen.
|
| - x = work_area.width() - w;
|
| - x_increment = -pop_position_offset_increment_x;
|
| - }
|
| - // Note: The passing (x,y,w,h) window is always relative to the work area's
|
| - // origin.
|
| - for (; x_increment > 0 ? (x < x_end) : (x > x_end); x += x_increment) {
|
| - int y = 0;
|
| - while (y + h <= work_area.height()) {
|
| - size_t i;
|
| - for (i = 0; i < regions.size(); i++) {
|
| - if (regions[i]->Intersects(gfx::Rect(x + work_area.x(),
|
| - y + work_area.y(), w, h))) {
|
| - y = regions[i]->bottom() - work_area.y();
|
| - if (grid > 1) {
|
| - // Align to the (next) grid step.
|
| - y = ash::WindowResizer::AlignToGridRoundUp(y, grid);
|
| - }
|
| - break;
|
| - }
|
| - }
|
| - if (i >= regions.size())
|
| - return gfx::Rect(x + work_area.x(), y + work_area.y(), w, h);
|
| - }
|
| - }
|
| - }
|
| - return gfx::Rect(0, 0, 0, 0);
|
| -}
|
| -
|
| -gfx::Rect WindowPositioner::AlignPopupPosition(
|
| - const gfx::Rect& pos,
|
| - const gfx::Rect& work_area,
|
| - int grid) {
|
| - if (grid <= 1)
|
| - return pos;
|
| -
|
| - int x = pos.x() - (pos.x() - work_area.x()) % grid;
|
| - int y = pos.y() - (pos.y() - work_area.y()) % grid;
|
| - int w = pos.width();
|
| - int h = pos.height();
|
| -
|
| - // If the alignment was pushing the window out of the screen, we ignore the
|
| - // alignment for that call.
|
| - if (abs(pos.right() - work_area.right()) < grid)
|
| - x = work_area.right() - w;
|
| - if (abs(pos.bottom() - work_area.bottom()) < grid)
|
| - y = work_area.bottom() - h;
|
| - return gfx::Rect(x, y, w, h);
|
| -}
|
|
|