haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Account for taskbar being on top for determining window positions on launch 

Windows doesnt need an ambiguous "screen border region" defined in percent, it's an absolute area given in pixels
Also we need to check the top corner y value to the ClientArea returned from the wxDisplay, in the situation the task bar is on top.

Fix #7850
This commit is contained in:
Marek Roszko 2021-04-29 20:18:19 -04:00
parent 6e874265fa
commit f083f043cb
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/eda_base_frame.cpp
View File

@ -548,17 +548,25 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
wxDisplay display( aState.display ); wxDisplay display( aState.display );
wxRect clientSize = display.GetClientArea(); wxRect clientSize = display.GetClientArea();
#ifndef _WIN32
// The percentage size (represented in decimal) of the region around the screen's border where // The percentage size (represented in decimal) of the region around the screen's border where
// an upper corner is not allowed // an upper corner is not allowed
#define SCREEN_BORDER_REGION 0.10 #define SCREEN_BORDER_REGION 0.10
#else
// Windows uses a very rectangular clearly defined display region, there is no ambigious "screen border region"
// GetClientArea already accounts for the taskbar stealing display space
#define SCREEN_BORDER_REGION 0
#endif
int yLim = clientSize.y + ( clientSize.height * ( 1.0 - SCREEN_BORDER_REGION ) ); int yLimTop = clientSize.y + ( clientSize.height * ( SCREEN_BORDER_REGION ) );
int yLimBottom = clientSize.y + ( clientSize.height * ( 1.0 - SCREEN_BORDER_REGION ) );
int xLimLeft = clientSize.x + ( clientSize.width * SCREEN_BORDER_REGION ); int xLimLeft = clientSize.x + ( clientSize.width * SCREEN_BORDER_REGION );
int xLimRight = clientSize.x + ( clientSize.width * ( 1.0 - SCREEN_BORDER_REGION ) ); int xLimRight = clientSize.x + ( clientSize.width * ( 1.0 - SCREEN_BORDER_REGION ) );
if( upperLeft.x > xLimRight || // Upper left corner too close to right edge of screen if( upperLeft.x > xLimRight || // Upper left corner too close to right edge of screen
upperRight.x < xLimLeft || // Upper right corner too close to left edge of screen upperRight.x < xLimLeft || // Upper right corner too close to left edge of screen
upperRight.y > yLim ) // Upper corner too close to the bottom of the screen upperLeft.y < yLimTop || // Upper corner too close to the bottom of the screen
upperLeft.y > yLimBottom )
{ {
m_framePos = wxDefaultPosition; m_framePos = wxDefaultPosition;
wxLogTrace( traceDisplayLocation, "Resetting to default position" ); wxLogTrace( traceDisplayLocation, "Resetting to default position" );