Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAleksoid <aleksoid@users.sourceforge.net>2010-08-25 03:26:18 +0400
committerAleksoid <aleksoid@users.sourceforge.net>2010-08-25 03:26:18 +0400
commitd48ab503ea73953ce5d28076ce0c1f557cd47e13 (patch)
treeeecc8a18a1f6beb74be43d5d02eff2ce3d1c137f /src
parent69e38e6fc9a2fc33dcfd35fd00039fe579255d7a (diff)
Fix : don't hide controls in full screen does not work unless you move the mouse, ticket #680
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2332 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
-rw-r--r--src/apps/mplayerc/MainFrm.cpp21
1 files changed, 19 insertions, 2 deletions
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
index 45f550b93..da9e1f354 100644
--- a/src/apps/mplayerc/MainFrm.cpp
+++ b/src/apps/mplayerc/MainFrm.cpp
@@ -9577,8 +9577,25 @@ void CMainFrame::ToggleFullscreen(bool fToNearest, bool fSwitchScreenResWhenHasT
if(m_fFullScreen)
{
m_fHideCursor = true;
- ShowControls(CS_NONE, false);
- ShowControlBar(&m_wndNavigationBar, false, TRUE);
+ if(AfxGetAppSettings().fShowBarsWhenFullScreen)
+ {
+ int nTimeOut = AfxGetAppSettings().nShowBarsWhenFullScreenTimeOut;
+ if(nTimeOut == 0)
+ {
+ ShowControls(CS_NONE, false);
+ ShowControlBar(&m_wndNavigationBar, false, TRUE);
+ }
+ else if(nTimeOut > 0)
+ {
+ SetTimer(TIMER_FULLSCREENCONTROLBARHIDER, nTimeOut*1000, NULL);
+ SetTimer(TIMER_FULLSCREENMOUSEHIDER, max(nTimeOut*1000, 2000), NULL);
+ }
+ }
+ else
+ {
+ ShowControls(CS_NONE, false);
+ ShowControlBar(&m_wndNavigationBar, false, TRUE);
+ }
if(s.m_fPreventMinimize)
{