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

really ensure that the window being centered is fully visible (fixes bug reported in patch 1683239); also place it on the same display as its parent, if any [backport from HEAD]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-22 23:14:30 +00:00
parent c3a30557ce
commit b46506f365
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/common/toplvcmn.cpp
View File

@@ -204,8 +204,10 @@ void wxTopLevelWindowBase::DoCentre(int dir)
if(IsAlwaysMaximized()) if(IsAlwaysMaximized())
return; return;
// we need the display rect anyhow so store it first // we need the display rect anyhow so store it first: notice that we should
int nDisplay = wxDisplay::GetFromWindow(this); // be centered on the same display as our parent window, the display of
// this window itself is not really defined yet
int nDisplay = wxDisplay::GetFromWindow(GetParent() ? GetParent() : this);
wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay); wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay);
const wxRect rectDisplay(dpy.GetClientArea()); const wxRect rectDisplay(dpy.GetClientArea());
@@ -246,30 +248,27 @@ void wxTopLevelWindowBase::DoCentre(int dir)
// we don't want to place the window off screen if Centre() is called as // we don't want to place the window off screen if Centre() is called as
// this is (almost?) never wanted and it would be very difficult to prevent // this is (almost?) never wanted and it would be very difficult to prevent
// it from happening from the user code if we didn't check for it here // it from happening from the user code if we didn't check for it here
if ( rectDisplay.Contains(rect.GetTopLeft()) ) if ( !rectDisplay.Contains(rect.GetTopLeft()) )
{ {
if ( !rectDisplay.Contains(rect.GetBottomRight()) ) // move the window just enough to make the corner visible
{ int dx = rectDisplay.GetLeft() - rect.GetLeft();
// check if we can move the window so that the bottom right corner int dy = rectDisplay.GetTop() - rect.GetTop();
// is visible without hiding the top left one rect.Offset(dx > 0 ? dx : 0, dy > 0 ? dy : 0);
int dx = rectDisplay.GetRight() - rect.GetRight();
int dy = rectDisplay.GetBottom() - rect.GetBottom();
rect.Offset(dx, dy);
}
//else: the window top left and bottom right corner are both visible,
// although the window might still be not entirely on screen (with
// 2 staggered displays for example) we wouldn't be able to
// improve the layout much in such case, so just leave it as is
} }
else // make top left corner visible
{
if ( rect.x < rectDisplay.x )
rect.x = rectDisplay.x;
if ( rect.y < rectDisplay.y ) if ( !rectDisplay.Contains(rect.GetBottomRight()) )
rect.y = rectDisplay.y; {
// do the same for this corner too
int dx = rectDisplay.GetRight() - rect.GetRight();
int dy = rectDisplay.GetBottom() - rect.GetBottom();
rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0);
} }
// the window top left and bottom right corner are both visible now and
// although the window might still be not entirely on screen (with 2
// staggered displays for example) we wouldn't be able to improve the
// layout much in such case, so we stop here
// -1 could be valid coordinate here if there are several displays // -1 could be valid coordinate here if there are several displays
SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
} }