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

partially fix bug [ wxwindows-Bugs-1145813 ] Centre() Doesn't Work With Dual Monitors , and note other part of bug

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-02-28 02:25:33 +00:00
parent 626fd61904
commit ce29e4fbe5
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/wincmn.cpp
View File

@@ -77,6 +77,10 @@
#include "wx/caret.h" #include "wx/caret.h"
#endif // wxUSE_CARET #endif // wxUSE_CARET
#if wxUSE_DISPLAY
#include "wx/display.h"
#endif
#if wxUSE_SYSTEM_OPTIONS #if wxUSE_SYSTEM_OPTIONS
#include "wx/sysopt.h" #include "wx/sysopt.h"
#endif #endif
@@ -431,6 +435,20 @@ void wxWindowBase::Centre(int direction)
if ( direction & wxCENTRE_ON_SCREEN ) if ( direction & wxCENTRE_ON_SCREEN )
{ {
//RN: If we are using wxDisplay we get
//the dimensions of the monitor the window is on,
//otherwise we get the dimensions of the primary monitor
#if wxUSE_DISPLAY
int nDisplay = wxDisplay::GetFromWindow((wxWindow*)this);
if(nDisplay != wxNOT_FOUND)
{
wxDisplay windowDisplay(nDisplay);
wxRect displayRect = windowDisplay.GetGeometry();
widthParent = displayRect.width;
heightParent = displayRect.height;
}
else
#endif
// centre with respect to the whole screen // centre with respect to the whole screen
wxDisplaySize(&widthParent, &heightParent); wxDisplaySize(&widthParent, &heightParent);
} }
@@ -471,6 +489,9 @@ void wxWindowBase::Centre(int direction)
xNew += posParent.x; xNew += posParent.x;
yNew += posParent.y; yNew += posParent.y;
// FIXME: This needs to get the client display rect of the display
// the window is (via wxDisplay::GetFromWindow).
// Base size of the visible dimensions of the display // Base size of the visible dimensions of the display
// to take into account the taskbar. And the Mac menu bar at top. // to take into account the taskbar. And the Mac menu bar at top.
wxRect clientrect = wxGetClientDisplayRect(); wxRect clientrect = wxGetClientDisplayRect();