Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix event log not being displayed on the same display as the manager

This commit is contained in:
Kevin Reed 2013-05-21 15:30:11 -05:00
parent 64ccb6afbf
commit 723127c4d4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clientgui/DlgEventLog.cpp
View File

@ -167,7 +167,8 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
#ifdef __WXMSW__
// Get the current display space for the current window
int iDisplay = wxDisplay::GetFromWindow(parent);
int iDisplay = wxNOT_FOUND;
if ( wxGetApp().GetFrame() != NULL ) iDisplay = wxDisplay::GetFromWindow(wxGetApp().GetFrame());
if ( iDisplay == wxNOT_FOUND ) iDisplay = 0;
wxDisplay *display = new wxDisplay(iDisplay);
wxRect rDisplay = display->GetClientArea();
@ -179,16 +180,16 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
// Check if part of the display was going to be off the screen, if so, center the
// display on that axis
if ( oTempPoint.x < 0 ) {
oTempPoint.x = 0;
} else if ( oTempPoint.x + oTempSize.GetWidth() > rDisplay.width ) {
oTempPoint.x = rDisplay.width - oTempSize.GetWidth();
if ( oTempPoint.x < rDisplay.x ) {
oTempPoint.x = rDisplay.x;
} else if ( oTempPoint.x + oTempSize.GetWidth() > rDisplay.x + rDisplay.width ) {
oTempPoint.x = rDisplay.x + rDisplay.width - oTempSize.GetWidth();
}
if ( oTempPoint.y < 0 ) {
oTempPoint.y = 0;
} else if ( oTempPoint.y + oTempSize.GetHeight() > rDisplay.height ) {
oTempPoint.y = rDisplay.height - oTempSize.GetHeight();
if ( oTempPoint.y < rDisplay.y ) {
oTempPoint.y = rDisplay.y;
} else if ( oTempPoint.y + oTempSize.GetHeight() > rDisplay.y + rDisplay.height ) {
oTempPoint.y = rDisplay.y + rDisplay.height - oTempSize.GetHeight();
}
delete display;