Index: ui/gfx/vector2d.h |
diff --git a/ui/gfx/vector2d.h b/ui/gfx/vector2d.h |
new file mode 100644 |
index 0000000000000000000000000000000000000000..faac5d790dccba3d7488656b59d0308ee1cc1b78 |
--- /dev/null |
+++ b/ui/gfx/vector2d.h |
@@ -0,0 +1,82 @@ |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+// Defines a simple integer vector class. This class is used to indicate a |
+// distance in two dimensions between two points. Subtracting two points should |
+// produce a vector, and adding a vector to a point produces the point at the |
+// vector's distance from the original point. |
+ |
+#ifndef UI_GFX_VECTOR2D_H_ |
+#define UI_GFX_VECTOR2D_H_ |
+ |
+#include <string> |
+ |
+#include "base/basictypes.h" |
+#include "ui/base/ui_export.h" |
+#include "ui/gfx/vector2d_f.h" |
+ |
+namespace gfx { |
+ |
+class UI_EXPORT Vector2d { |
+ public: |
+ Vector2d(); |
+ Vector2d(int x, int y); |
+ |
+ int x() const { return x_; } |
+ void set_x(int x) { x_ = x; } |
Peter Kasting
2012/10/30 01:14:14
Only ParamTraits uses set_x() and set_y(). I wond
danakj
2012/10/30 19:21:21
I made the code in render_text use set_x() for the
Peter Kasting
2012/10/30 20:24:37
Oh. I'm not sure I actually like that change. As
danakj
2012/10/30 21:14:52
Ok, I've undone that to not use set_x().
|
+ |
+ int y() const { return y_; } |
+ void set_y(int y) { y_ = y; } |
+ |
+ // True if both components of the vector are 0. |
+ bool IsZero() const; |
Peter Kasting
2012/10/30 01:14:14
Nit: Nowhere besides tests seem to use this, remov
danakj
2012/10/30 19:21:21
This is used in the cc/ code. I added it here when
Peter Kasting
2012/10/30 20:24:37
No, it's fine.
|
+ |
+ // Adds |x| and |y| to the x-axis and y-axis components respectively. |
+ void Grow(int x, int y); |
+ |
+ // Add the components of the |other| vector to the current vector. |
+ void Add(const Vector2d& other); |
+ // Subtract the components of the |other| vector from the current vector. |
+ void Subtract(const Vector2d& other); |
+ |
+ void operator+=(const Vector2d& other) { Add(other); } |
+ void operator-=(const Vector2d& other) { Subtract(other); } |
+ |
+ // Gives the square of the diagonal length of the vector. |
Peter Kasting
2012/10/30 01:14:14
Nit: Perhaps add note that this is cheaper than Le
|
+ int64 LengthSquared() const; |
+ // Gives the diagonal length of the vector. |
+ float Length() const; |
+ |
+ std::string ToString() const; |
+ |
+ operator Vector2dF() const { return Vector2dF(x_, y_); } |
+ |
+ private: |
+ int x_; |
+ int y_; |
+}; |
+ |
+inline bool operator==(const Vector2d& lhs, const Vector2d& rhs) { |
+ return lhs.x() == rhs.x() && lhs.y() == rhs.y(); |
+} |
+ |
+inline Vector2d operator-(const Vector2d& v) { |
+ return Vector2d(-v.x(), -v.y()); |
+} |
+ |
+inline Vector2d operator+(const Vector2d& lhs, const Vector2d& rhs) { |
+ Vector2d result = lhs; |
+ result.Add(rhs); |
+ return result; |
+} |
+ |
+inline Vector2d operator-(const Vector2d& lhs, const Vector2d& rhs) { |
+ Vector2d result = lhs; |
+ result.Add(-rhs); |
+ return result; |
+} |
+ |
+} // namespace gfx |
+ |
+#endif // UI_GFX_VECTOR2D_H_ |