Kaydet (Commit) 109d1d19 authored tarafından Caolán McNamara's avatar Caolán McNamara

gtk3: get rid of this incorrectly gtk3-only positioning limits holdover

its clearly accidental to do this only for gtk3, left over from various
screen/xinerama untangling efforts

Change-Id: Ic91f41fad5748f68fbefca1d6798fef6e2efe469
üst b12cd99f
...@@ -2093,34 +2093,6 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u ...@@ -2093,34 +2093,6 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
nY += m_pParent->maGeometry.nY; nY += m_pParent->maGeometry.nY;
} }
#if GTK_CHECK_VERSION(3,0,0)
// adjust position to avoid off screen windows
// but allow toolbars to be positioned partly off screen by the user
Size aScreenSize = getDisplay()->GetScreenSize( GetDisplayScreen() );
if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
{
if( nX < (long)maGeometry.nLeftDecoration )
nX = maGeometry.nLeftDecoration;
if( nY < (long)maGeometry.nTopDecoration )
nY = maGeometry.nTopDecoration;
if( (nX + (long)maGeometry.nWidth + (long)maGeometry.nRightDecoration) > (long)aScreenSize.Width() )
nX = aScreenSize.Width() - maGeometry.nWidth - maGeometry.nRightDecoration;
if( (nY + (long)maGeometry.nHeight + (long)maGeometry.nBottomDecoration) > (long)aScreenSize.Height() )
nY = aScreenSize.Height() - maGeometry.nHeight - maGeometry.nBottomDecoration;
}
else
{
if( nX + (long)maGeometry.nWidth < 10 )
nX = 10 - (long)maGeometry.nWidth;
if( nY + (long)maGeometry.nHeight < 10 )
nY = 10 - (long)maGeometry.nHeight;
if( nX > (long)aScreenSize.Width() - 10 )
nX = (long)aScreenSize.Width() - 10;
if( nY > (long)aScreenSize.Height() - 10 )
nY = (long)aScreenSize.Height() - 10;
}
#endif
if( nX != maGeometry.nX || nY != maGeometry.nY ) if( nX != maGeometry.nX || nY != maGeometry.nY )
bMoved = true; bMoved = true;
maGeometry.nX = nX; maGeometry.nX = nX;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment