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

don't offset the window being centered more than strictly necessary for it to be on screen (replaces patch 1683239)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-20 12:56:53 +00:00
parent 76046d7390
commit ca08b543ec
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/toplvcmn.cpp
View File

@@ -231,7 +231,7 @@ void wxTopLevelWindowBase::DoCentre(int dir)
if ( rectParent.IsEmpty() ) if ( rectParent.IsEmpty() )
{ {
// we were explicitely asked to centre this window on the entire screen // we were explicitly asked to centre this window on the entire screen
// or if we have no parent anyhow and so can't centre on it // or if we have no parent anyhow and so can't centre on it
rectParent = rectDisplay; rectParent = rectDisplay;
} }
@@ -250,11 +250,11 @@ void wxTopLevelWindowBase::DoCentre(int dir)
{ {
if ( !rectDisplay.Contains(rect.GetBottomRight()) ) if ( !rectDisplay.Contains(rect.GetBottomRight()) )
{ {
// check if we can move the window so that the bottom right corner // move the window just enough for the bottom right corner to
// is visible without hiding the top left one // become visible
int dx = rectDisplay.GetRight() - rect.GetRight(); int dx = rectDisplay.GetRight() - rect.GetRight();
int dy = rectDisplay.GetBottom() - rect.GetBottom(); int dy = rectDisplay.GetBottom() - rect.GetBottom();
rect.Offset(dx, dy); rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0);
} }
//else: the window top left and bottom right corner are both visible, //else: the window top left and bottom right corner are both visible,
// although the window might still be not entirely on screen (with // although the window might still be not entirely on screen (with