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" |
(...skipping 18 matching lines...) Expand all Loading... | |
29 ~RectF(); | 29 ~RectF(); |
30 | 30 |
31 /// Scales the rectangle by |scale|. | 31 /// Scales the rectangle by |scale|. |
32 void Scale(float scale) { | 32 void Scale(float scale) { |
33 Scale(scale, scale); | 33 Scale(scale, scale); |
34 } | 34 } |
35 | 35 |
36 void Scale(float x_scale, float y_scale) { | 36 void Scale(float x_scale, float y_scale) { |
37 set_origin(ScalePoint(origin(), x_scale, y_scale)); | 37 set_origin(ScalePoint(origin(), x_scale, y_scale)); |
38 | 38 |
39 SizeF newSize = size().Scale(x_scale, y_scale); | 39 SizeF newSize = size().Scale(x_scale, y_scale); |
sky
2012/11/09 17:03:55
newSize -> new_size
danakj
2012/11/09 17:06:57
Done.
| |
40 newSize.ClampToNonNegative(); | |
41 set_size(newSize); | 40 set_size(newSize); |
42 } | 41 } |
43 | 42 |
44 // This method reports if the RectF can be safely converted to an integer | 43 // This method reports if the RectF can be safely converted to an integer |
45 // Rect. When it is false, some dimension of the RectF is outside the bounds | 44 // Rect. When it is false, some dimension of the RectF is outside the bounds |
46 // of what an integer can represent, and converting it to a Rect will require | 45 // of what an integer can represent, and converting it to a Rect will require |
47 // clamping. | 46 // clamping. |
48 bool IsExpressibleAsRect() const; | 47 bool IsExpressibleAsRect() const; |
49 | 48 |
50 std::string ToString() const; | 49 std::string ToString() const; |
(...skipping 24 matching lines...) Expand all Loading... | |
75 // contained within the rect, because they will appear on one of these edges. | 74 // contained within the rect, because they will appear on one of these edges. |
76 UI_EXPORT RectF BoundingRect(const PointF& p1, const PointF& p2); | 75 UI_EXPORT RectF BoundingRect(const PointF& p1, const PointF& p2); |
77 | 76 |
78 #if !defined(COMPILER_MSVC) | 77 #if !defined(COMPILER_MSVC) |
79 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; | 78 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; |
80 #endif | 79 #endif |
81 | 80 |
82 } // namespace gfx | 81 } // namespace gfx |
83 | 82 |
84 #endif // UI_GFX_RECT_F_H_ | 83 #endif // UI_GFX_RECT_F_H_ |
OLD | NEW |