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

Side by Side Diff: ash/laser/laser_pointer_view.cc

Issue 2311393004: Laser tool blocks events from propagating. (Closed)
Patch Set: Created 4 years, 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/common/system/chromeos/palette/tools/laser_pointer_view.h" 5 #include "ash/laser/laser_pointer_view.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/shell_window_ids.h" 9 #include "ash/common/shell_window_ids.h"
10 #include "ash/common/wm_root_window_controller.h" 10 #include "ash/laser/laser_pointer_points.h"
11 #include "ash/common/wm_shell.h" 11 #include "base/timer/timer.h"
12 #include "ash/common/wm_window.h"
13 #include "third_party/skia/include/core/SkColor.h" 12 #include "third_party/skia/include/core/SkColor.h"
14 #include "third_party/skia/include/core/SkPaint.h" 13 #include "third_party/skia/include/core/SkPaint.h"
14 #include "ui/aura/window.h"
15 #include "ui/events/event.h"
15 #include "ui/gfx/canvas.h" 16 #include "ui/gfx/canvas.h"
17 #include "ui/views/widget/widget.h"
16 18
17 namespace ash { 19 namespace ash {
18 namespace { 20 namespace {
19 21
22 // Variables for rendering the laser.
jdufault 2016/09/12 21:10:12 Specify units of the radius variables
sammiequon 2016/09/13 01:09:56 Done.
20 const double kPointInitialRadius = 5; 23 const double kPointInitialRadius = 5;
21 const double kPointFinalRadius = 0.25; 24 const double kPointFinalRadius = 0.25;
22 const int kPointInitialOpacity = 200; 25 const int kPointInitialOpacity = 200;
23 const int kPointFinalOpacity = 0; 26 const int kPointFinalOpacity = 0;
24 const SkColor kPointColor = SkColorSetRGB(255, 0, 0); 27 const SkColor kPointColor = SkColorSetRGB(255, 0, 0);
25 28
29 // Name of the laser overlay.
30 const char kPartialMagniferWindowName[] = "LaserOverlay";
31
26 float DistanceBetweenPoints(const gfx::Point& point1, 32 float DistanceBetweenPoints(const gfx::Point& point1,
27 const gfx::Point& point2) { 33 const gfx::Point& point2) {
28 return (point1 - point2).Length(); 34 return (point1 - point2).Length();
29 } 35 }
30 36
31 double LinearInterpolate(double initial_value, 37 double LinearInterpolate(double initial_value,
32 double final_value, 38 double final_value,
33 double progress) { 39 double progress) {
34 return initial_value + (final_value - initial_value) * progress; 40 return initial_value + (final_value - initial_value) * progress;
35 } 41 }
36 42
37 } // namespace 43 } // namespace
38 44
39 //////////////////////////////////////////////////////////////////////////////// 45 ////////////////////////////////////////////////////////////////////////////////
40 46
41 // LaserPointerView 47 // LaserPointerView
42 LaserPointerView::LaserPointerView(base::TimeDelta life_duration) 48 LaserPointerView::LaserPointerView(base::TimeDelta life_duration,
49 aura::Window* root_window)
43 : laser_points_(life_duration) { 50 : laser_points_(life_duration) {
44 widget_.reset(new views::Widget); 51 widget_.reset(new views::Widget);
45 views::Widget::InitParams params; 52 views::Widget::InitParams params;
46 params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS; 53 params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
47 params.name = "LaserOverlay"; 54 params.name = kPartialMagniferWindowName;
48 params.accept_events = false; 55 params.accept_events = false;
49 params.activatable = views::Widget::InitParams::ACTIVATABLE_NO; 56 params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
50 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 57 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
51 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 58 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
52 WmShell::Get() 59 params.parent = root_window;
53 ->GetRootWindowForNewWindows() 60
54 ->GetRootWindowController()
55 ->ConfigureWidgetInitParamsForContainer(
56 widget_.get(), kShellWindowId_OverlayContainer, &params);
57 widget_->Init(params); 61 widget_->Init(params);
58 widget_->Show(); 62 widget_->Show();
59 widget_->SetContentsView(this); 63 widget_->SetContentsView(this);
60 set_owned_by_client(); 64 set_owned_by_client();
61 } 65 }
62 66
63 LaserPointerView::~LaserPointerView() {} 67 LaserPointerView::~LaserPointerView() {}
64 68
65 void LaserPointerView::Stop() { 69 void LaserPointerView::Stop() {
66 laser_points_.Clear(); 70 laser_points_.Clear();
67 SchedulePaint(); 71 SchedulePaint();
68 } 72 }
69 73
74 aura::Window* LaserPointerView::GetRootWindow() {
75 return widget_->GetNativeView()->GetRootWindow();
76 }
77
70 void LaserPointerView::AddNewPoint(const gfx::Point& new_point) { 78 void LaserPointerView::AddNewPoint(const gfx::Point& new_point) {
71 laser_points_.AddPoint(new_point); 79 laser_points_.AddPoint(new_point);
72 // Expand the bounding box so that it includes the radius of the points on the 80 // Expand the bounding box so that it includes the radius of the points on the
73 // edges. 81 // edges.
74 gfx::Rect bounding_box; 82 gfx::Rect bounding_box;
75 bounding_box = laser_points_.GetBoundingBox(); 83 bounding_box = laser_points_.GetBoundingBox();
76 bounding_box.Offset(-kPointInitialRadius, -kPointInitialRadius); 84 bounding_box.Offset(-kPointInitialRadius, -kPointInitialRadius);
77 bounding_box.set_width(bounding_box.width() + (kPointInitialRadius * 2)); 85 bounding_box.set_width(bounding_box.width() + (kPointInitialRadius * 2));
78 bounding_box.set_height(bounding_box.height() + (kPointInitialRadius * 2)); 86 bounding_box.set_height(bounding_box.height() + (kPointInitialRadius * 2));
79 widget_->SetBounds(bounding_box); 87 widget_->SetBounds(bounding_box);
80 SchedulePaint(); 88 SchedulePaint();
81 } 89 }
82 90
83 void LaserPointerView::OnPaint(gfx::Canvas* canvas) { 91 void LaserPointerView::OnPaint(gfx::Canvas* canvas) {
84 if (laser_points_.IsEmpty()) 92 if (laser_points_.IsEmpty())
85 return; 93 return;
86 94
87 SkPaint paint; 95 SkPaint paint;
88 paint.setStyle(SkPaint::kStroke_Style); 96 paint.setStyle(SkPaint::kStroke_Style);
89 paint.setAntiAlias(true); 97 paint.setAntiAlias(true);
90 paint.setStrokeJoin(SkPaint::kBevel_Join); 98 paint.setStrokeJoin(SkPaint::kBevel_Join);
91 99
92 base::Time oldest = laser_points_.GetOldest().creation_time; 100 base::Time oldest = laser_points_.GetOldest().creation_time;
93 base::Time newest = laser_points_.GetNewest().creation_time; 101 base::Time newest = laser_points_.GetNewest().creation_time;
94 gfx::Point previous_point = laser_points_.GetOldest().location; 102 gfx::Point previous_point = laser_points_.GetOldest().location;
95 gfx::Point current_point; 103 gfx::Point current_point;
96 gfx::Rect widget_bounds = widget_->GetWindowBoundsInScreen(); 104 // Compute the offset.
jdufault 2016/09/12 21:10:12 offset of what?
sammiequon 2016/09/13 01:09:56 Done.
105 gfx::Point root_window_bounds =
106 widget_->GetNativeView()->GetRootWindow()->GetBoundsInScreen().origin();
107 gfx::Point widget_bounds = widget_->GetWindowBoundsInScreen().origin();
108 gfx::Point offset = gfx::Point(widget_bounds.x() - root_window_bounds.x(),
109 widget_bounds.y() - root_window_bounds.y());
97 int num_points_ = laser_points_.GetNumberOfPoints(); 110 int num_points_ = laser_points_.GetNumberOfPoints();
98 int point_count = 0; 111 int point_count = 0;
99 for (const LaserPointerPoints::LaserPoint& point : 112 for (const LaserPointerPoints::LaserPoint& point :
100 laser_points_.laser_points()) { 113 laser_points_.laser_points()) {
101 // relative_time is a value between [0,1] where 0 means the point is about 114 // relative_time is a value between [0,1] where 0 means the point is about
102 // to be removed and 1 means that the point was just added. 115 // to be removed and 1 means that the point was just added.
103 double relative_time = 1.0; 116 double relative_time = 1.0;
104 if (oldest != newest) { 117 if (oldest != newest) {
105 relative_time = 1.0 - ((point.creation_time - oldest).InMillisecondsF() / 118 relative_time = 1.0 - ((point.creation_time - oldest).InMillisecondsF() /
106 (newest - oldest).InMillisecondsF()); 119 (newest - oldest).InMillisecondsF());
107 } 120 }
108 121
109 // Set the radius and opacity based on the distance. 122 // Set the radius and opacity based on the distance.
110 double radius = LinearInterpolate(kPointInitialRadius, kPointFinalRadius, 123 double radius = LinearInterpolate(kPointInitialRadius, kPointFinalRadius,
111 relative_time); 124 relative_time);
112 125
113 gfx::Vector2d center = point.location - widget_bounds.origin(); 126 gfx::Vector2d center = point.location - offset;
114 current_point = gfx::Point(center.x(), center.y()); 127 current_point = gfx::Point(center.x(), center.y());
115 128
116 // If we draw laser_points_ that are within a stroke width of each other, 129 // If we draw laser_points_ that are within a stroke width of each other,
117 // the result will be very jagged, unless we are on the last point, then we 130 // the result will be very jagged, unless we are on the last point, then we
118 // draw regardless. 131 // draw regardless.
119 point_count++; 132 point_count++;
120 float distance_threshold = float{radius * 2}; 133 float distance_threshold = float{radius * 2};
121 if (DistanceBetweenPoints(previous_point, current_point) <= 134 if (DistanceBetweenPoints(previous_point, current_point) <=
122 distance_threshold && 135 distance_threshold &&
123 point_count != num_points_) { 136 point_count != num_points_) {
124 continue; 137 continue;
125 } 138 }
126 139
127 int opacity = 140 int opacity =
128 int{LinearInterpolate(double{kPointInitialOpacity}, 141 int{LinearInterpolate(double{kPointInitialOpacity},
129 double{kPointFinalOpacity}, relative_time)}; 142 double{kPointFinalOpacity}, relative_time)};
130 paint.setColor(SkColorSetA(kPointColor, opacity)); 143 paint.setColor(SkColorSetA(kPointColor, opacity));
131 paint.setStrokeWidth(radius * 2); 144 paint.setStrokeWidth(radius * 2);
132 canvas->DrawLine(previous_point, current_point, paint); 145 canvas->DrawLine(previous_point, current_point, paint);
133 previous_point = current_point; 146 previous_point = current_point;
134 } 147 }
148 // Draw the last point as a circle.
135 paint.setColor(SkColorSetA(kPointColor, kPointInitialOpacity)); 149 paint.setColor(SkColorSetA(kPointColor, kPointInitialOpacity));
136 paint.setStyle(SkPaint::kFill_Style); 150 paint.setStyle(SkPaint::kFill_Style);
137 canvas->DrawCircle(current_point, kPointInitialRadius, paint); 151 canvas->DrawCircle(current_point, kPointInitialRadius, paint);
138 } 152 }
139 } // namespace ash 153 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698