diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 08:43:08 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 08:43:08 +0000 |
| commit | 06506fc071ae0f72b1ed0bd8b016d41c66625d40 (patch) | |
| tree | 3f2365bb0a1d81e9a93526f6555f2080f0c06055 /ash/wm/window_resizer.cc | |
| parent | 92e29c600431c2fd47f1cc0c5b4de3b20c5a16d8 (diff) | |
| download | chromium_src-06506fc071ae0f72b1ed0bd8b016d41c66625d40.zip chromium_src-06506fc071ae0f72b1ed0bd8b016d41c66625d40.tar.gz chromium_src-06506fc071ae0f72b1ed0bd8b016d41c66625d40.tar.bz2 | |
Revert 124385 - Allows tab dragging when maximized on aura. To fix it I made it so
that you can drag a maximized window when tab dragging and no
constraints are imposed on the window. Only when the mouse is released
do we do anything. This only handles the multiple tab case, if you've
selected all the tabs in a maximized window we won't detach.
BUG=116074
TEST=none
R=ben@chromium.org
Reverting to fix linker issues, see http://crbug.com/116074 for details.
Review URL: http://codereview.chromium.org/9549009
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9565004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_resizer.cc')
| -rw-r--r-- | ash/wm/window_resizer.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index 2557a92..e2838e9 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc @@ -106,6 +106,13 @@ gfx::Point ConvertPointToParent(aura::Window* window, return result; } +bool IsNormalWindow(aura::Window* window) { + return window->GetProperty(aura::client::kShowStateKey) == + ui::SHOW_STATE_NORMAL || + window->GetProperty(aura::client::kShowStateKey) == + ui::SHOW_STATE_DEFAULT; +} + } // namespace // static @@ -135,7 +142,8 @@ WindowResizer::WindowResizer(aura::Window* window, GetPositionChangeDirectionForWindowComponent(window_component_)), size_change_direction_( GetSizeChangeDirectionForWindowComponent(window_component_)), - is_resizable_(bounds_change_ != kBoundsChangeDirection_None), + is_resizable_(bounds_change_ != kBoundsChangeDirection_None && + IsNormalWindow(window)), grid_size_(grid_size), did_move_or_resize_(false), root_filter_(NULL) { |