github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-24 14:22:40 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: const issues

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2907 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-12-13 14:05:36 +00:00
parent d373b9d1ce
commit db587765b8
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/CtrlCore.h
View file

@ -1158,7 +1158,7 @@ public:
Ctrl& NoIgnoreMouse() { return IgnoreMouse(false); }
bool HasMouse() const;
bool HasMouseDeep() const;
bool HasMouseInFrame(const Rect& r);
bool HasMouseInFrame(const Rect& r) const;
bool HasMouseIn(const Rect& r) const;
Point GetMouseViewPos() const;
static Ctrl *GetMouseCtrl();

2
uppsrc/CtrlCore/CtrlMouse.cpp
View file

@ -392,7 +392,7 @@ Ctrl *Ctrl::GetMouseCtrl()
return mouseCtrl;
}
bool Ctrl::HasMouseInFrame(const Rect& r)
bool Ctrl::HasMouseInFrame(const Rect& r) const
{
GuiLock __;
if(!HasMouse())

10
uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp
View file

@ -1535,8 +1535,14 @@ lay inside it.&]
events.&]
[s3;%- &]
[s4;%- &]
[s5;:Ctrl`:`:HasMouseInFrame`(const Rect`&`):%- [@(0.0.255) bool]_[* HasMouseInFrame]([@(0.0.255) c
onst]_[_^`:`:Rect^ Rect][@(0.0.255) `&]_[*@3 r])&]
[s5;:Ctrl`:`:HasMouseDeep`(`)const:%- [@(0.0.255) bool]_[* HasMouseDeep]()_[@(0.0.255) cons
t]&]
[s2; Returns true if Ctrl or any of its descendants is target for
mouse events.&]
[s3;%- &]
[s4;%- &]
[s5;:Ctrl`:`:HasMouseInFrame`(const Rect`&`)const:%- [@(0.0.255) bool]_[* HasMouseInFrame
]([@(0.0.255) const]_[_^Rect^ Rect][@(0.0.255) `&]_[*@3 r])_[@(0.0.255) const]&]
[s7;i1120;a17; [%-*C@3 r]-|rectangle in frame area.&]
[s7;i1120;a17; [*/ Return value]-|true when Ctrl is target for mouse
events and mouse pointer is inside specified frame area rectangle.&]