Commit b3c59120 authored by David Faure's avatar David Faure
Browse files

Forwardport fix for "Bug 53642: Menubar is always visible after coming back...

Forwardport fix for "Bug 53642: Menubar is always visible after coming back from fullscreen" by Vinay S Shastry

svn path=/trunk/KDE/kdebase/konqueror/; revision=581613
parent a7a5018f
......@@ -197,6 +197,8 @@ KonqMainWindow::KonqMainWindow( const KUrl &initialURL, bool openInitialURL, con
m_toolBarViewModesGroup = new QActionGroup(this);
m_toolBarViewModesGroup->setExclusive(true);
m_prevMenuBarVisible = true;
m_pViewManager = new KonqViewManager( this );
m_toggleViewGUIClient = new ToggleViewGUIClient( this );
......@@ -3516,6 +3518,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
}
m_prevMenuBarVisible = menuBar()->isVisible();
menuBar()->hide();
m_paShowMenuBar->setChecked( false );
......@@ -3535,8 +3538,11 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
setWindowState( windowState() & ~Qt::WindowFullScreen );
unplugActionList( "fullscreen" );
menuBar()->show(); // maybe we should store this setting instead of forcing it
m_paShowMenuBar->setChecked( true );
if (m_prevMenuBarVisible)
{
menuBar()->show();
m_paShowMenuBar->setChecked( true );
}
// Qt bug, the flags aren't restored. They know about it.
//setWFlags( WType_TopLevel | WDestructiveClose );
......
......@@ -607,6 +607,8 @@ private:
QObject* lastFrame( KonqView *view );
private: // members
KNewMenu * m_pMenuNew;
KAction *m_paPrint;
......@@ -674,14 +676,16 @@ private:
KToggleFullScreenAction *m_ptaFullScreen;
uint m_bLocationBarConnected:1;
uint m_bURLEnterLock:1;
bool m_bLocationBarConnected:1;
bool m_bURLEnterLock:1;
// Global settings
uint m_bSaveViewPropertiesLocally:1;
uint m_bHTMLAllowed:1;
bool m_bSaveViewPropertiesLocally:1;
bool m_bHTMLAllowed:1;
// Set in constructor, used in slotRunFinished
uint m_bNeedApplyKonqMainWindowSettings:1;
uint m_bViewModeToggled:1;
bool m_bNeedApplyKonqMainWindowSettings:1;
bool m_bViewModeToggled:1;
bool m_urlCompletionStarted:1;
bool m_prevMenuBarVisible:1;
int m_goBuffer;
Qt::MouseButtons m_goMouseState;
......@@ -751,8 +755,6 @@ private:
QString m_currentDir; // stores current dir for relative URLs whenever applicable
bool m_urlCompletionStarted;
static bool s_preloaded;
static KonqMainWindow* s_preloadedWindow;
static int s_initialMemoryUsage;
......
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