github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: GetOpaqueRect, GetVoidRect now const

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2910 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-12-15 14:15:31 +00:00
parent f24ef09b62
commit 0f6f083fc8
7 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/CtrlCore/CtrlCore.h
View file

@ -996,8 +996,8 @@ public:
virtual bool IsShowEnabled() const;
virtual Rect GetOpaqueRect();
virtual Rect GetVoidRect();
virtual Rect GetOpaqueRect() const;
virtual Rect GetVoidRect() const ;
virtual void Updated();

4
uppsrc/CtrlCore/CtrlDraw.cpp
View file

@ -217,12 +217,12 @@ void Ctrl::SyncScroll()
}
}
Rect Ctrl::GetOpaqueRect()
Rect Ctrl::GetOpaqueRect() const
{
return IsTransparent() ? Rect(0, 0, 0, 0) : GetSize();
}
Rect Ctrl::GetVoidRect()
Rect Ctrl::GetVoidRect() const
{
return Rect(0, 0, 0, 0);
}

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

@ -632,6 +632,21 @@ during modal dialog lifetime are displayed with enabled Ctrls.&]
enabled.&]
[s3;%- &]
[s4;%- &]
[s5;:Ctrl`:`:GetOpaqueRect`(`)const:%- [@(0.0.255) virtual] [_^Rect^ Rect]_[* GetOpaqueRect
]()_[@(0.0.255) const]&]
[s2; Returns the rectangle of view area that is opaque (is completely
filled when painting the widget). The default implementation
returns the whole view area if Transparent flag is set, empty
rectangle otherwise. Paint routine uses this information to optimize.&]
[s3;%- &]
[s4;%- &]
[s5;:Ctrl`:`:GetVoidRect`(`)const:%- [@(0.0.255) virtual] [_^Rect^ Rect]_[* GetVoidRect]()_
[@(0.0.255) const]&]
[s2; Returns the rectangle of view area that is fully transparent
(nothing is painted in that rectangle). Paint routine uses this
information to optimize.&]
[s3;%- &]
[s4;%- &]
[s5;:Ctrl`:`:OverPaint`(`)const:%- [@(0.0.255) virtual] [@(0.0.255) int]_[* OverPaint]()_[@(0.0.255) c
onst]&]
[s2;b17;a17; This method can returns non`-zero number that represents
@ -641,20 +656,6 @@ This is useful to represent some specific skinning effect (like
glare around the button). Default implementation returns zero.&]
[s3;%- &]
[s4;%- &]
[s5;:Ctrl`:`:GetOpaqueRect`(`):%- [@(0.0.255) virtual] [_^`:`:Rect^ Rect]_[* GetOpaqueRect](
)&]
[s2;b17;a17; Returns the rectangle of view area that is opaque (is
completely filled when painting the widget). The default implementation
returns the whole view area if Transparent flag is set, empty
rectangle otherwise. Paint routine uses this information to optimize.&]
[s3;%- &]
[s4;%- &]
[s5;:Ctrl`:`:GetVoidRect`(`):%- [@(0.0.255) virtual] [_^`:`:Rect^ Rect]_[* GetVoidRect]()&]
[s2;b17;a17; Returns the rectangle of view area that is fully transparent
(nothing is painted in that rectangle). Paint routine uses this
information to optimize.&]
[s3;%- &]
[s4;%- &]
[s5;:Ctrl`:`:Close`(`):%- [@(0.0.255) virtual] [@(0.0.255) void]_[* Close]()&]
[s2;b17;a17; Closes top`-level Ctrl. If Ctrl is not top`-level, has
no effect. If it is and is open in host GUI (either as pop`-up

4
uppsrc/CtrlLib/Static.cpp
View file

@ -95,7 +95,7 @@ void LabelBox::AssignAccessKeys(dword used)
LabelBox::~LabelBox() {}
Rect LabelBox::GetVoidRect()
Rect LabelBox::GetVoidRect() const
{
Rect r = GetSize();
r.left += 2;
@ -180,7 +180,7 @@ void LabelBox::Paint(Draw& w)
w.End();
}
Rect ParentCtrl::GetVoidRect()
Rect ParentCtrl::GetVoidRect() const
{
return GetSize();
}

4
uppsrc/CtrlLib/StaticCtrl.h
View file

@ -39,7 +39,7 @@ class LabelBox : public Label {
public:
virtual void Paint(Draw& w);
virtual void AssignAccessKeys(dword used);
virtual Rect GetVoidRect();
virtual Rect GetVoidRect() const;
public:
LabelBox();
@ -57,7 +57,7 @@ class ParentCtrl : public Ctrl {
Size minsize;
public:
virtual Rect GetVoidRect();
virtual Rect GetVoidRect() const;
virtual Size GetStdSize() const;
virtual Size GetMinSize() const;

2
uppsrc/CtrlLib/TabCtrl.cpp
View file

@ -162,7 +162,7 @@ void TabCtrl::Tabs::Paint(Draw& w)
static_cast<TabCtrl *>(GetParent())->PaintTabs(w);
}
Rect TabCtrl::GetOpaqueRect()
Rect TabCtrl::GetOpaqueRect() const
{
return pane.GetRect();
}

2
uppsrc/CtrlLib/TabCtrl.h
View file

@ -9,7 +9,7 @@ public:
virtual bool Key(dword key, int count);
virtual bool HotKey(dword key);
virtual void Layout();
virtual Rect GetOpaqueRect();
virtual Rect GetOpaqueRect() const;
virtual Value GetData() const;
virtual void SetData(const Value& data);