remove sizing controls when being in fullscreen mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9761ab4338
commit
f3b2e2d719
@ -938,6 +938,7 @@ typedef struct
|
|||||||
{
|
{
|
||||||
wxPoint m_position ;
|
wxPoint m_position ;
|
||||||
wxSize m_size ;
|
wxSize m_size ;
|
||||||
|
bool m_wasResizable ;
|
||||||
}
|
}
|
||||||
FullScreenData ;
|
FullScreenData ;
|
||||||
|
|
||||||
@ -1404,6 +1405,7 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
|
|||||||
m_macFullScreenData = data ;
|
m_macFullScreenData = data ;
|
||||||
data->m_position = GetPosition() ;
|
data->m_position = GetPosition() ;
|
||||||
data->m_size = GetSize() ;
|
data->m_size = GetSize() ;
|
||||||
|
data->m_wasResizable = MacGetWindowAttributes() & kWindowResizableAttribute ;
|
||||||
|
|
||||||
if ( style & wxFULLSCREEN_NOMENUBAR )
|
if ( style & wxFULLSCREEN_NOMENUBAR )
|
||||||
HideMenuBar() ;
|
HideMenuBar() ;
|
||||||
@ -1444,11 +1446,15 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
|
|||||||
}
|
}
|
||||||
|
|
||||||
SetSize( x , y , w, h ) ;
|
SetSize( x , y , w, h ) ;
|
||||||
|
if( data->m_wasResizable )
|
||||||
|
MacChangeWindowAttributes( kWindowNoAttributes , kWindowResizableAttribute ) ;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ShowMenuBar() ;
|
ShowMenuBar() ;
|
||||||
FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
|
FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
|
||||||
|
if( data->m_wasResizable )
|
||||||
|
MacChangeWindowAttributes( kWindowResizableAttribute , kWindowNoAttributes ) ;
|
||||||
SetPosition( data->m_position ) ;
|
SetPosition( data->m_position ) ;
|
||||||
SetSize( data->m_size ) ;
|
SetSize( data->m_size ) ;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user