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

Side by Side Diff: ui/aura/event.h

Issue 10383249: touch: Make sure the correct radius values are used for touch events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: non-zero-scale Created 8 years, 7 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 | « content/browser/renderer_host/web_input_event_aurax11.cc ('k') | ui/aura/event.cc » ('j') | 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 #ifndef UI_AURA_EVENT_H_ 5 #ifndef UI_AURA_EVENT_H_
6 #define UI_AURA_EVENT_H_ 6 #define UI_AURA_EVENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 virtual float RadiusX() const OVERRIDE; 223 virtual float RadiusX() const OVERRIDE;
224 virtual float RadiusY() const OVERRIDE; 224 virtual float RadiusY() const OVERRIDE;
225 virtual float RotationAngle() const OVERRIDE; 225 virtual float RotationAngle() const OVERRIDE;
226 virtual float Force() const OVERRIDE; 226 virtual float Force() const OVERRIDE;
227 227
228 private: 228 private:
229 // The identity (typically finger) of the touch starting at 0 and incrementing 229 // The identity (typically finger) of the touch starting at 0 and incrementing
230 // for each separable additional touch that the hardware can detect. 230 // for each separable additional touch that the hardware can detect.
231 const int touch_id_; 231 const int touch_id_;
232 232
233 // Radius of the X (major) axis of the touch ellipse. 1.0 if unknown. 233 // Radius of the X (major) axis of the touch ellipse. 0.0 if unknown.
234 float radius_x_; 234 float radius_x_;
235 235
236 // Radius of the Y (minor) axis of the touch ellipse. 1.0 if unknown. 236 // Radius of the Y (minor) axis of the touch ellipse. 0.0 if unknown.
237 float radius_y_; 237 float radius_y_;
238 238
239 // Angle of the major axis away from the X axis. Default 0.0. 239 // Angle of the major axis away from the X axis. Default 0.0.
240 const float rotation_angle_; 240 const float rotation_angle_;
241 241
242 // Force (pressure) of the touch. Normalized to be [0, 1]. Default to be 0.0. 242 // Force (pressure) of the touch. Normalized to be [0, 1]. Default to be 0.0.
243 const float force_; 243 const float force_;
244 244
245 DISALLOW_COPY_AND_ASSIGN(TouchEvent); 245 DISALLOW_COPY_AND_ASSIGN(TouchEvent);
246 }; 246 };
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 // This value is stored as a bitfield because the number of touch ids varies, 395 // This value is stored as a bitfield because the number of touch ids varies,
396 // but we currently don't need more than 32 touches at a time. 396 // but we currently don't need more than 32 touches at a time.
397 const unsigned int touch_ids_bitfield_; 397 const unsigned int touch_ids_bitfield_;
398 398
399 DISALLOW_COPY_AND_ASSIGN(GestureEvent); 399 DISALLOW_COPY_AND_ASSIGN(GestureEvent);
400 }; 400 };
401 401
402 } // namespace aura 402 } // namespace aura
403 403
404 #endif // UI_AURA_EVENT_H_ 404 #endif // UI_AURA_EVENT_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/web_input_event_aurax11.cc ('k') | ui/aura/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698