AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure that client display rectangle is always less than its total area.

Browse Source 
Under Unix we could return client display rectangle that was bigger than the
entire display size as it corresponded to the total screen size when
_NET_WORKAREA was not supported or was not correctly implemented by the WM.

Fix this by explicitly intersecting the client rect with the total one.

Closes #14419.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-12-28 00:44:09 +00:00
parent 3bb9348f93
commit dee05929ba
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/unix/displayx11.cpp
View File

@ -424,6 +424,8 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
Display * const dpy = wxGetX11Display();
wxCHECK_RET( dpy, wxT("can't be called before initializing the GUI") );
wxRect rectClient;
const Atom atomWorkArea = XInternAtom(dpy, "_NET_WORKAREA", True);
if ( atomWorkArea )
{
@ -459,29 +461,46 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
numItems != 4 )
{
wxLogDebug(wxT("XGetWindowProperty(\"_NET_WORKAREA\") failed"));
return;
}
if ( x )
*x = workareas[0];
if ( y )
*y = workareas[1];
if ( width )
*width = workareas[2];
if ( height )
*height = workareas[3];
return;
else
{
rectClient = wxRect(workareas[0], workareas[1],
workareas[2], workareas[3]);
}
}
}
// if we get here, _NET_WORKAREA is not supported so return the entire
// screen size as fall back
if (x)
*x = 0;
if (y)
*y = 0;
wxDisplaySize(width, height);
// Although _NET_WORKAREA is supposed to return the client size of the
// screen, not all implementations are conforming, apparently, see #14419,
// so make sure we return a subset of the primary display.
wxRect rectFull;
#if wxUSE_DISPLAY
ScreensInfo screens;
const ScreenInfo& info = screens[0];
rectFull = wxRect(info.x_org, info.y_org, info.width, info.height);
#else
wxDisplaySize(&rectFull.width, &rectFull.height);
#endif
if ( !rectClient.width || !rectClient.height )
{
// _NET_WORKAREA not available or didn't work, fall back to the total
// display size.
rectClient = rectFull;
}
else
{
rectClient = rectClient.Intersect(rectFull);
}
if ( x )
*x = rectClient.x;
if ( y )
*y = rectClient.y;
if ( width )
*width = rectClient.width;
if ( height )
*height = rectClient.height;
}
#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON