ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-01 16:50:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vector: changed conversion constructor to conversion operator

Browse Source
This commit is contained in:
sub.mohanty@samsung.com
2019-07-21 15:24:28 +09:00
committed by Subhransu
parent 577dbd51b7
commit 7d3d41978a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vector/vrect.h
View File

@@ -29,7 +29,7 @@ public:
VRect() = default;
VRect(int x, int y, int w, int h):x1(x),y1(y),x2(x+w),y2(y+h){}
explicit VRect(VPoint pt, VSize sz):VRect(pt.x(), pt.y(), sz.width(), sz.height()){}
explicit VRect(const VRectF &r);
operator VRectF() const;
V_CONSTEXPR bool empty() const {return x1 >= x2 || y1 >= y2;}
V_CONSTEXPR int left() const {return x1;}
V_CONSTEXPR int top() const {return y1;}
@@ -120,8 +120,9 @@ public:
VRectF(double x, double y, double w, double h):
x1(float(x)),y1(float(y)),
x2(float(x+w)),y2(float(y+h)){}
explicit VRectF(const VRect &r):VRectF(r.x(), r.y(), r.width(), r.height()){}
operator VRect() const {
return {int(left()), int(right()), int(width()), int(height())};
}
V_CONSTEXPR bool empty() const {return x1 >= x2 || y1 >= y2;}
V_CONSTEXPR float left() const {return x1;}
@@ -157,8 +158,11 @@ private:
float y2{0};
};
inline VRect::VRect(const VRectF &r):x1(int(r.left())),y1(int(r.top())),
x2(int(r.right())),y2(int(r.bottom())){}
inline VRect::operator VRectF() const
{
return {double(left()), double(right()), double(width()), double(height())};
}
V_END_NAMESPACE
#endif // VRECT_H