mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'qPCR4vir-hotfixes-1.0.1' into hotfixes-1.0.1

Browse Source
This commit is contained in:
Jinhao 2015-04-10 00:51:01 +08:00
commit ba918a33ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/basic_types.cpp
View File

@ -739,12 +739,12 @@ namespace nana
int rectangle::right() const int rectangle::right() const
{ {
return static_cast<int>(x + width); return x + static_cast<int>(width);
} }
int rectangle::bottom() const int rectangle::bottom() const
{ {
return static_cast<int>(y + height); return y + static_cast<int>(height);
} }
bool rectangle::is_hit(int pos_x, int pos_y) const bool rectangle::is_hit(int pos_x, int pos_y) const
@ -756,7 +756,7 @@ namespace nana
bool rectangle::is_hit(const point& pos) const bool rectangle::is_hit(const point& pos) const
{ {
return (x <= pos.x && pos.x < x + static_cast<int>(width)) && return (x <= pos.x && pos.x < x + static_cast<int>(width)) &&
(y <= pos.y && pos.y < y + static_cast<int>(height)); (y <= pos.y && pos.y < y + static_cast<int>(height));
} }
bool rectangle::empty() const bool rectangle::empty() const