Commit 7ab733f2 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: fix Menu->View->Fullscreen interface state.

parent b505449c
...@@ -1159,9 +1159,14 @@ void MainInterface::toggleFullScreen( void ) ...@@ -1159,9 +1159,14 @@ void MainInterface::toggleFullScreen( void )
{ {
showNormal(); showNormal();
emit askUpdate(); // Needed if video was launched after the F11 emit askUpdate(); // Needed if video was launched after the F11
QVLCMenu::fullscreenViewAction->setChecked( false );
} }
else else
{
showFullScreen(); showFullScreen();
QVLCMenu::fullscreenViewAction->setChecked( true );
}
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -76,6 +76,7 @@ static QActionGroup *currentGroup; ...@@ -76,6 +76,7 @@ static QActionGroup *currentGroup;
/* HACK for minimalView to go around a Qt bug/feature /* HACK for minimalView to go around a Qt bug/feature
* that doesn't update the QAction checked state when QMenu is hidden */ * that doesn't update the QAction checked state when QMenu is hidden */
QAction *QVLCMenu::minimalViewAction = NULL; QAction *QVLCMenu::minimalViewAction = NULL;
QAction *QVLCMenu::fullscreenViewAction = NULL;
QMenu *QVLCMenu::recentsMenu = NULL; QMenu *QVLCMenu::recentsMenu = NULL;
...@@ -440,6 +441,7 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, ...@@ -440,6 +441,7 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
/* FullScreen View */ /* FullScreen View */
action = menu->addAction( qtr( "&Fullscreen Interface" ), mi, action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
SLOT( toggleFullScreen() ), QString( "F11" ) ); SLOT( toggleFullScreen() ), QString( "F11" ) );
fullscreenViewAction = action;
action->setCheckable( true ); action->setCheckable( true );
action->setData( true ); action->setData( true );
......
...@@ -96,6 +96,7 @@ public: ...@@ -96,6 +96,7 @@ public:
/* HACK for minimalView */ /* HACK for minimalView */
static QAction *minimalViewAction; static QAction *minimalViewAction;
static QAction *fullscreenViewAction;
private: private:
/* All main Menus */ /* All main Menus */
......
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