Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support wxFULLSCREEN_NOSTATUSBAR

Browse Source 
Correct Get/SetClientSize() accordingly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-10-18 19:17:10 +00:00
parent 3a8b3bd159
commit 0fb2e8796d
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/frame.cpp
View File

@@ -221,7 +221,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
{ {
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
// menu bar // menu bar
if (m_frameMenuBar) if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0)))
{ {
if (!m_menuBarDetached) if (!m_menuBarDetached)
(*height) -= m_menuBarHeight; (*height) -= m_menuBarHeight;
@@ -232,7 +232,8 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// status bar // status bar
if (m_frameStatusBar && m_frameStatusBar->IsShown()) if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
!(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))
(*height) -= wxSTATUS_HEIGHT; (*height) -= wxSTATUS_HEIGHT;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
} }
@@ -276,7 +277,7 @@ void wxFrame::DoSetClientSize( int width, int height )
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
// menu bar // menu bar
if (m_frameMenuBar) if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0)))
{ {
if (!m_menuBarDetached) if (!m_menuBarDetached)
height += m_menuBarHeight; height += m_menuBarHeight;
@@ -287,7 +288,9 @@ void wxFrame::DoSetClientSize( int width, int height )
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// status bar // status bar
if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT; if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
!(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))
height += wxSTATUS_HEIGHT;
#endif #endif
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
@@ -479,8 +482,12 @@ void wxFrame::GtkOnSize()
} }
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
if (m_frameStatusBar && m_frameStatusBar->IsShown()) if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
!(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))
{ {
if (!GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
gtk_widget_show( m_frameStatusBar->m_widget );
int xx = 0 + m_miniEdge; int xx = 0 + m_miniEdge;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
int ww = m_width - 2*m_miniEdge; int ww = m_width - 2*m_miniEdge;
@@ -495,6 +502,14 @@ void wxFrame::GtkOnSize()
m_frameStatusBar->m_widget, m_frameStatusBar->m_widget,
xx, yy, ww, hh ); xx, yy, ww, hh );
} }
else
{
if (m_frameStatusBar)
{
if (GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
gtk_widget_hide( m_frameStatusBar->m_widget );
}
}
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
m_sizeSet = true; m_sizeSet = true;