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

Side by Side Diff: ash/wm/panels/panel_window_event_handler.cc

Issue 144193002: Only drag or maximize / restore when event has not yet been handled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always ignore handled events. Created 6 years, 10 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/wm/panels/panel_window_event_handler.h" 5 #include "ash/wm/panels/panel_window_event_handler.h"
6 6
7 #include "ash/metrics/user_metrics_recorder.h" 7 #include "ash/metrics/user_metrics_recorder.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/wm/window_state.h" 9 #include "ash/wm/window_state.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/aura/window_delegate.h" 11 #include "ui/aura/window_delegate.h"
12 #include "ui/base/hit_test.h" 12 #include "ui/base/hit_test.h"
13 #include "ui/events/event.h" 13 #include "ui/events/event.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace internal { 16 namespace internal {
17 17
18 PanelWindowEventHandler::PanelWindowEventHandler() { 18 PanelWindowEventHandler::PanelWindowEventHandler() {
19 } 19 }
20 20
21 PanelWindowEventHandler::~PanelWindowEventHandler() { 21 PanelWindowEventHandler::~PanelWindowEventHandler() {
22 } 22 }
23 23
24 void PanelWindowEventHandler::OnMouseEvent(ui::MouseEvent* event) { 24 void PanelWindowEventHandler::OnMouseEvent(ui::MouseEvent* event) {
25 aura::Window* target = static_cast<aura::Window*>(event->target()); 25 aura::Window* target = static_cast<aura::Window*>(event->target());
26 if (event->type() == ui::ET_MOUSE_PRESSED && 26 if (!event->handled() &&
27 event->type() == ui::ET_MOUSE_PRESSED &&
27 event->flags() & ui::EF_IS_DOUBLE_CLICK && 28 event->flags() & ui::EF_IS_DOUBLE_CLICK &&
28 event->IsOnlyLeftMouseButton() && 29 event->IsOnlyLeftMouseButton() &&
29 target->delegate()->GetNonClientComponent(event->location()) == 30 target->delegate()->GetNonClientComponent(event->location()) ==
30 HTCAPTION) { 31 HTCAPTION) {
31 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction( 32 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
32 ash::UMA_PANEL_MINIMIZE_CAPTION_CLICK); 33 ash::UMA_PANEL_MINIMIZE_CAPTION_CLICK);
33 wm::GetWindowState(target)->Minimize(); 34 wm::GetWindowState(target)->Minimize();
34 event->StopPropagation(); 35 event->StopPropagation();
35 return; 36 return;
36 } 37 }
37 } 38 }
38 39
39 void PanelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) { 40 void PanelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
40 aura::Window* target = static_cast<aura::Window*>(event->target()); 41 aura::Window* target = static_cast<aura::Window*>(event->target());
41 if (event->type() == ui::ET_GESTURE_TAP && 42 if (!event->handled() &&
43 event->type() == ui::ET_GESTURE_TAP &&
42 event->details().tap_count() == 2 && 44 event->details().tap_count() == 2 &&
43 target->delegate()->GetNonClientComponent(event->location()) == 45 target->delegate()->GetNonClientComponent(event->location()) ==
44 HTCAPTION) { 46 HTCAPTION) {
45 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction( 47 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
46 ash::UMA_PANEL_MINIMIZE_CAPTION_GESTURE); 48 ash::UMA_PANEL_MINIMIZE_CAPTION_GESTURE);
47 wm::GetWindowState(target)->Minimize(); 49 wm::GetWindowState(target)->Minimize();
48 event->StopPropagation(); 50 event->StopPropagation();
49 return; 51 return;
50 } 52 }
51 } 53 }
52 54
53 } // namespace internal 55 } // namespace internal
54 } // namespace ash 56 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/toplevel_window_event_handler.cc » ('j') | ash/wm/workspace/workspace_event_handler_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698