| OLD | NEW |
| 1 // Copyright (c) 2011 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 // Defines a simple integer rectangle class. The containment semantics | 5 // Defines a simple integer rectangle class. The containment semantics |
| 6 // are array-like; that is, the coordinate (x, y) is considered to be | 6 // are array-like; that is, the coordinate (x, y) is considered to be |
| 7 // contained by the rectangle, but the coordinate (x + width, y) is not. | 7 // contained by the rectangle, but the coordinate (x + width, y) is not. |
| 8 // The class will happily let you create malformed rectangles (that is, | 8 // The class will happily let you create malformed rectangles (that is, |
| 9 // rectangles with negative width and/or height), but there will be assertions | 9 // rectangles with negative width and/or height), but there will be assertions |
| 10 // in the operations (such as Contains()) to complain in this case. | 10 // in the operations (such as Contains()) to complain in this case. |
| 11 | 11 |
| 12 #ifndef UI_GFX_RECT_H_ | 12 #ifndef UI_GFX_RECT_H_ |
| 13 #define UI_GFX_RECT_H_ | 13 #define UI_GFX_RECT_H_ |
| 14 #pragma once | 14 #pragma once |
| 15 | 15 |
| 16 #include <string> | 16 #include <string> |
| 17 | 17 |
| 18 #include "ui/gfx/point.h" | 18 #include "ui/gfx/point.h" |
| 19 #include "ui/gfx/size.h" | 19 #include "ui/gfx/size.h" |
| 20 | 20 |
| 21 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| 22 typedef struct tagRECT RECT; | 22 typedef struct tagRECT RECT; |
| 23 #elif defined(TOOLKIT_GTK) | 23 #elif defined(TOOLKIT_GTK) |
| 24 typedef struct _GdkRectangle GdkRectangle; | 24 typedef struct _GdkRectangle GdkRectangle; |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 #if defined(USE_WAYLAND) | |
| 28 typedef struct _cairo_rectangle_int cairo_rectangle_int_t; | |
| 29 #endif | |
| 30 | |
| 31 namespace gfx { | 27 namespace gfx { |
| 32 | 28 |
| 33 class Insets; | 29 class Insets; |
| 34 | 30 |
| 35 class UI_EXPORT Rect { | 31 class UI_EXPORT Rect { |
| 36 public: | 32 public: |
| 37 Rect(); | 33 Rect(); |
| 38 Rect(int width, int height); | 34 Rect(int width, int height); |
| 39 Rect(int x, int y, int width, int height); | 35 Rect(int x, int y, int width, int height); |
| 40 #if defined(OS_WIN) | 36 #if defined(OS_WIN) |
| 41 explicit Rect(const RECT& r); | 37 explicit Rect(const RECT& r); |
| 42 #elif defined(OS_MACOSX) | 38 #elif defined(OS_MACOSX) |
| 43 explicit Rect(const CGRect& r); | 39 explicit Rect(const CGRect& r); |
| 44 #elif defined(TOOLKIT_GTK) | 40 #elif defined(TOOLKIT_GTK) |
| 45 explicit Rect(const GdkRectangle& r); | 41 explicit Rect(const GdkRectangle& r); |
| 46 #endif | 42 #endif |
| 47 #if defined(USE_WAYLAND) | |
| 48 explicit Rect(const cairo_rectangle_int_t& r); | |
| 49 #endif | |
| 50 explicit Rect(const gfx::Size& size); | 43 explicit Rect(const gfx::Size& size); |
| 51 Rect(const gfx::Point& origin, const gfx::Size& size); | 44 Rect(const gfx::Point& origin, const gfx::Size& size); |
| 52 | 45 |
| 53 ~Rect(); | 46 ~Rect(); |
| 54 | 47 |
| 55 #if defined(OS_WIN) | 48 #if defined(OS_WIN) |
| 56 Rect& operator=(const RECT& r); | 49 Rect& operator=(const RECT& r); |
| 57 #elif defined(OS_MACOSX) | 50 #elif defined(OS_MACOSX) |
| 58 Rect& operator=(const CGRect& r); | 51 Rect& operator=(const CGRect& r); |
| 59 #elif defined(TOOLKIT_GTK) | 52 #elif defined(TOOLKIT_GTK) |
| 60 Rect& operator=(const GdkRectangle& r); | 53 Rect& operator=(const GdkRectangle& r); |
| 61 #endif | 54 #endif |
| 62 #if defined(USE_WAYLAND) | |
| 63 Rect& operator=(const cairo_rectangle_int_t& r); | |
| 64 #endif | |
| 65 | 55 |
| 66 int x() const { return origin_.x(); } | 56 int x() const { return origin_.x(); } |
| 67 void set_x(int x) { origin_.set_x(x); } | 57 void set_x(int x) { origin_.set_x(x); } |
| 68 | 58 |
| 69 int y() const { return origin_.y(); } | 59 int y() const { return origin_.y(); } |
| 70 void set_y(int y) { origin_.set_y(y); } | 60 void set_y(int y) { origin_.set_y(y); } |
| 71 | 61 |
| 72 int width() const { return size_.width(); } | 62 int width() const { return size_.width(); } |
| 73 void set_width(int width) { size_.set_width(width); } | 63 void set_width(int width) { size_.set_width(width); } |
| 74 | 64 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 112 |
| 123 #if defined(OS_WIN) | 113 #if defined(OS_WIN) |
| 124 // Construct an equivalent Win32 RECT object. | 114 // Construct an equivalent Win32 RECT object. |
| 125 RECT ToRECT() const; | 115 RECT ToRECT() const; |
| 126 #elif defined(TOOLKIT_GTK) | 116 #elif defined(TOOLKIT_GTK) |
| 127 GdkRectangle ToGdkRectangle() const; | 117 GdkRectangle ToGdkRectangle() const; |
| 128 #elif defined(OS_MACOSX) | 118 #elif defined(OS_MACOSX) |
| 129 // Construct an equivalent CoreGraphics object. | 119 // Construct an equivalent CoreGraphics object. |
| 130 CGRect ToCGRect() const; | 120 CGRect ToCGRect() const; |
| 131 #endif | 121 #endif |
| 132 #if defined(USE_WAYLAND) | |
| 133 cairo_rectangle_int_t ToCairoRectangle() const; | |
| 134 #endif | |
| 135 | 122 |
| 136 // Returns true if the point identified by point_x and point_y falls inside | 123 // Returns true if the point identified by point_x and point_y falls inside |
| 137 // this rectangle. The point (x, y) is inside the rectangle, but the | 124 // this rectangle. The point (x, y) is inside the rectangle, but the |
| 138 // point (x + width, y + height) is not. | 125 // point (x + width, y + height) is not. |
| 139 bool Contains(int point_x, int point_y) const; | 126 bool Contains(int point_x, int point_y) const; |
| 140 | 127 |
| 141 // Returns true if the specified point is contained by this rectangle. | 128 // Returns true if the specified point is contained by this rectangle. |
| 142 bool Contains(const gfx::Point& point) const { | 129 bool Contains(const gfx::Point& point) const { |
| 143 return Contains(point.x(), point.y()); | 130 return Contains(point.x(), point.y()); |
| 144 } | 131 } |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 std::string ToString() const; | 178 std::string ToString() const; |
| 192 | 179 |
| 193 private: | 180 private: |
| 194 gfx::Point origin_; | 181 gfx::Point origin_; |
| 195 gfx::Size size_; | 182 gfx::Size size_; |
| 196 }; | 183 }; |
| 197 | 184 |
| 198 } // namespace gfx | 185 } // namespace gfx |
| 199 | 186 |
| 200 #endif // UI_GFX_RECT_H_ | 187 #endif // UI_GFX_RECT_H_ |
| OLD | NEW |