Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a fix for Centre() to always use the top level parent

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-05-11 11:05:04 +00:00
parent 9b9d5355c8
commit 7162312f78
1 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/common/wincmn.cpp
View File

@@ -321,13 +321,27 @@ bool wxWindowBase::DestroyChildren()
// centre the window with respect to its parent in either (or both) directions // centre the window with respect to its parent in either (or both) directions
void wxWindowBase::Centre(int direction) void wxWindowBase::Centre(int direction)
{ {
// the position/size of the parent window or of the entire screen
wxPoint posParent;
int widthParent, heightParent; int widthParent, heightParent;
wxWindow *parent = GetParent(); wxWindow *parent = NULL;
if ( !parent )
if ( !(direction & wxCENTRE_ON_SCREEN) )
{ {
// no other choice // find the top level parent to centre this window on
direction |= wxCENTRE_ON_SCREEN; parent = GetParent();
while ( parent && !parent->IsTopLevel() )
{
parent = parent->GetParent();
}
// did we find the parent?
if ( !parent )
{
// no other choice
direction |= wxCENTRE_ON_SCREEN;
}
} }
if ( direction & wxCENTRE_ON_SCREEN ) if ( direction & wxCENTRE_ON_SCREEN )
@@ -337,10 +351,13 @@ void wxWindowBase::Centre(int direction)
} }
else else
{ {
if (IsTopLevel()) if ( IsTopLevel() )
{ {
// centre on the parent // centre on the parent
parent->GetSize(&widthParent, &heightParent); parent->GetSize(&widthParent, &heightParent);
// adjust to the parents position
posParent = parent->GetPosition();
} }
else else
{ {
@@ -361,29 +378,8 @@ void wxWindowBase::Centre(int direction)
if ( direction & wxVERTICAL ) if ( direction & wxVERTICAL )
yNew = (heightParent - height)/2; yNew = (heightParent - height)/2;
// controls are always centered on their parent because it doesn't make xNew += posParent.x;
// sense to centre them on the screen yNew += posParent.y;
if ( !(direction & wxCENTRE_ON_SCREEN) || !IsTopLevel() )
{
// the only chance to get this is to have a not top level window
// without parent which shouldn't happen
wxCHECK_RET( parent, wxT("this window must have a parent") );
wxPoint posParent;
if (IsTopLevel())
{
// adjust to the parents position
posParent = parent->GetPosition();
}
else
{
// adjust to the parents client area origin
posParent = parent->ClientToScreen(wxPoint(0, 0));
}
xNew += posParent.x;
yNew += posParent.y;
}
// move the centre of this window to this position // move the centre of this window to this position
Move(xNew, yNew); Move(xNew, yNew);