Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: ui/views/widget/root_view.cc

Issue 9580001: Aura: Update window frames, allow resize from outside window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix caption for maximized windows, new resize cursor tweak Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/resources/ui_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/widget/root_view.h" 5 #include "ui/views/widget/root_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 mouse_move_handler_ = v; 298 mouse_move_handler_ = v;
299 MouseEvent entered_event(e, this, mouse_move_handler_); 299 MouseEvent entered_event(e, this, mouse_move_handler_);
300 mouse_move_handler_->OnMouseEntered(entered_event); 300 mouse_move_handler_->OnMouseEntered(entered_event);
301 } 301 }
302 MouseEvent moved_event(e, this, mouse_move_handler_); 302 MouseEvent moved_event(e, this, mouse_move_handler_);
303 mouse_move_handler_->OnMouseMoved(moved_event); 303 mouse_move_handler_->OnMouseMoved(moved_event);
304 if (!(moved_event.flags() & ui::EF_IS_NON_CLIENT)) 304 if (!(moved_event.flags() & ui::EF_IS_NON_CLIENT))
305 widget_->SetCursor(mouse_move_handler_->GetCursor(moved_event)); 305 widget_->SetCursor(mouse_move_handler_->GetCursor(moved_event));
306 } else if (mouse_move_handler_ != NULL) { 306 } else if (mouse_move_handler_ != NULL) {
307 mouse_move_handler_->OnMouseExited(e); 307 mouse_move_handler_->OnMouseExited(e);
308 widget_->SetCursor(gfx::kNullCursor); 308 // On Aura the non-client area extends slightly outside the root view for
309 // some windows. Let the non-client cursor handling code set the cursor
310 // as we do above.
311 if (!(e.flags() & ui::EF_IS_NON_CLIENT))
312 widget_->SetCursor(gfx::kNullCursor);
James Cook 2012/03/02 19:17:55 I tested this on Windows and this entire "else if"
309 } 313 }
310 } 314 }
311 315
312 void RootView::OnMouseExited(const MouseEvent& event) { 316 void RootView::OnMouseExited(const MouseEvent& event) {
313 if (mouse_move_handler_ != NULL) { 317 if (mouse_move_handler_ != NULL) {
314 mouse_move_handler_->OnMouseExited(event); 318 mouse_move_handler_->OnMouseExited(event);
315 mouse_move_handler_ = NULL; 319 mouse_move_handler_ = NULL;
316 } 320 }
317 } 321 }
318 322
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 } 484 }
481 485
482 void RootView::SetMouseLocationAndFlags(const MouseEvent& event) { 486 void RootView::SetMouseLocationAndFlags(const MouseEvent& event) {
483 last_mouse_event_flags_ = event.flags(); 487 last_mouse_event_flags_ = event.flags();
484 last_mouse_event_x_ = event.x(); 488 last_mouse_event_x_ = event.x();
485 last_mouse_event_y_ = event.y(); 489 last_mouse_event_y_ = event.y();
486 } 490 }
487 491
488 } // namespace internal 492 } // namespace internal
489 } // namespace views 493 } // namespace views
OLDNEW
« no previous file with comments | « ui/resources/ui_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698