| OLD | NEW |
| 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_GFX_RECT_F_H_ | 5 #ifndef UI_GFX_RECT_F_H_ |
| 6 #define UI_GFX_RECT_F_H_ | 6 #define UI_GFX_RECT_F_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ui/gfx/point_f.h" | 10 #include "ui/gfx/point_f.h" |
| 11 #include "ui/gfx/rect_base.h" | 11 #include "ui/gfx/rect_base.h" |
| 12 #include "ui/gfx/size_f.h" | 12 #include "ui/gfx/size_f.h" |
| 13 #include "ui/gfx/vector2d_f.h" | 13 #include "ui/gfx/vector2d_f.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 | 16 |
| 17 class InsetsF; | 17 class InsetsF; |
| 18 | 18 |
| 19 // A floating version of gfx::Rect. | 19 // A floating version of gfx::Rect. |
| 20 class UI_EXPORT RectF | 20 class GFX_EXPORT RectF |
| 21 : public RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> { | 21 : public RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> { |
| 22 public: | 22 public: |
| 23 RectF() | 23 RectF() |
| 24 : RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> | 24 : RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> |
| 25 (SizeF()) {} | 25 (SizeF()) {} |
| 26 | 26 |
| 27 RectF(float width, float height) | 27 RectF(float width, float height) |
| 28 : RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> | 28 : RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> |
| 29 (SizeF(width, height)) {} | 29 (SizeF(width, height)) {} |
| 30 | 30 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 76 |
| 77 inline RectF operator-(const RectF& lhs, const Vector2dF& rhs) { | 77 inline RectF operator-(const RectF& lhs, const Vector2dF& rhs) { |
| 78 return RectF(lhs.x() - rhs.x(), lhs.y() - rhs.y(), | 78 return RectF(lhs.x() - rhs.x(), lhs.y() - rhs.y(), |
| 79 lhs.width(), lhs.height()); | 79 lhs.width(), lhs.height()); |
| 80 } | 80 } |
| 81 | 81 |
| 82 inline RectF operator+(const Vector2dF& lhs, const RectF& rhs) { | 82 inline RectF operator+(const Vector2dF& lhs, const RectF& rhs) { |
| 83 return rhs + lhs; | 83 return rhs + lhs; |
| 84 } | 84 } |
| 85 | 85 |
| 86 UI_EXPORT RectF IntersectRects(const RectF& a, const RectF& b); | 86 GFX_EXPORT RectF IntersectRects(const RectF& a, const RectF& b); |
| 87 UI_EXPORT RectF UnionRects(const RectF& a, const RectF& b); | 87 GFX_EXPORT RectF UnionRects(const RectF& a, const RectF& b); |
| 88 UI_EXPORT RectF SubtractRects(const RectF& a, const RectF& b); | 88 GFX_EXPORT RectF SubtractRects(const RectF& a, const RectF& b); |
| 89 | 89 |
| 90 inline RectF ScaleRect(const RectF& r, float x_scale, float y_scale) { | 90 inline RectF ScaleRect(const RectF& r, float x_scale, float y_scale) { |
| 91 return RectF(r.x() * x_scale, r.y() * y_scale, | 91 return RectF(r.x() * x_scale, r.y() * y_scale, |
| 92 r.width() * x_scale, r.height() * y_scale); | 92 r.width() * x_scale, r.height() * y_scale); |
| 93 } | 93 } |
| 94 | 94 |
| 95 inline RectF ScaleRect(const RectF& r, float scale) { | 95 inline RectF ScaleRect(const RectF& r, float scale) { |
| 96 return ScaleRect(r, scale, scale); | 96 return ScaleRect(r, scale, scale); |
| 97 } | 97 } |
| 98 | 98 |
| 99 // Constructs a rectangle with |p1| and |p2| as opposite corners. | 99 // Constructs a rectangle with |p1| and |p2| as opposite corners. |
| 100 // | 100 // |
| 101 // This could also be thought of as "the smallest rect that contains both | 101 // This could also be thought of as "the smallest rect that contains both |
| 102 // points", except that we consider points on the right/bottom edges of the | 102 // points", except that we consider points on the right/bottom edges of the |
| 103 // rect to be outside the rect. So technically one or both points will not be | 103 // rect to be outside the rect. So technically one or both points will not be |
| 104 // contained within the rect, because they will appear on one of these edges. | 104 // contained within the rect, because they will appear on one of these edges. |
| 105 UI_EXPORT RectF BoundingRect(const PointF& p1, const PointF& p2); | 105 GFX_EXPORT RectF BoundingRect(const PointF& p1, const PointF& p2); |
| 106 | 106 |
| 107 #if !defined(COMPILER_MSVC) | 107 #if !defined(COMPILER_MSVC) |
| 108 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; | 108 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; |
| 109 #endif | 109 #endif |
| 110 | 110 |
| 111 } // namespace gfx | 111 } // namespace gfx |
| 112 | 112 |
| 113 #endif // UI_GFX_RECT_F_H_ | 113 #endif // UI_GFX_RECT_F_H_ |
| OLD | NEW |