From ede7020ab37352c03ce6edaaf2fc080c731e97fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 18 Feb 2002 23:30:41 +0000 Subject: [PATCH] better approach to centering windows (in absence of somebody else's solution...) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/wincmn.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index f1b4b5ef7c..27bb0f0bc4 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -405,18 +405,18 @@ void wxWindowBase::Centre(int direction) wxRect rect = wxGetClientDisplayRect(); wxSize size (rect.width,rect.height); -#ifndef __WXMGL__ // FIXME - temporary dirty hack!! - if (posParent.x >= 0) // if parent is on the main display -#endif + // NB: in wxMSW, negative position may not neccessary mean "out of screen", + // but it may mean that the window is placed on other than the main + // display. Therefore we only make sure centered window is on the main display + // if the parent is at least partially present here. + if (posParent.x + widthParent >= 0) // if parent is (partially) on the main display { if (xNew < 0) xNew = 0; else if (xNew+width > size.x) xNew = size.x-width-1; } -#ifndef __WXMGL__ // FIXME - temporary dirty hack!! - if (posParent.y >= 0) // if parent is on the main display -#endif + if (posParent.y + heightParent >= 0) // if parent is (partially) on the main display { if (yNew+height > size.y) yNew = size.y-height-1; -- 2.45.2