Fix the reversed behavior of the playlist option "Hide on fullscreen" when "Launch files in fullscreen" is enabled.

This commit fixes ticket #1290.


git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4309 10f7b99b-c216-0410-bff0-8a66a9350fd8

4 files changed, 20 insertions, 13 deletions

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
index 1f4aa90e4..5be67ca87 100644
--- a/docs/Changelog.txt
+++ b/docs/Changelog.txt
@@ -39,6 +39,8 @@ Legend:
    - when the selected file cannot be dubbed (for example when opening an rtsp

      stream), the wrong label was grayed out

 ! Ticket #1182, Unable to playback MPEG2 in AVI

+! Ticket #1290, Fix the reversed behavior of the playlist option "Hide on fullscreen"

+  when "Launch files in fullscreen" is enabled

 ! Ticket #1589, Crash with "Null (uncompressed)"

 ! Ticket #1946, Skipping bug with EVR custom output and .webm with vsync on

 ! Ticket #2090, Better handling of font fallback in the MediaInfo dialog so that

diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
index b3267d321..e59e5db10 100644
--- a/src/apps/mplayerc/MainFrm.cpp
+++ b/src/apps/mplayerc/MainFrm.cpp
@@ -9519,25 +9519,12 @@ void CMainFrame::SetDefaultWindowRect(int iMonitor)
 		CenterWindow();

 	}

 

-	// Waffs : fullscreen command line

-	if (!(s.nCLSwitches&CLSW_ADD) && (s.nCLSwitches&CLSW_FULLSCREEN) && !s.slFiles.IsEmpty()) {

-		ToggleFullscreen(true, true);

-		SetCursor(NULL);

-		AfxGetAppSettings().nCLSwitches &= ~CLSW_FULLSCREEN;

-		m_fFirstFSAfterLaunchOnFS = true;

-	}

-

 	if (s.fRememberWindowSize && s.fRememberWindowPos) {

 		if (lastWindowType == SIZE_MAXIMIZED) {

 			ShowWindow(SW_MAXIMIZE);

 		} else if (lastWindowType == SIZE_MINIMIZED) {

 			ShowWindow(SW_MINIMIZE);

 		}

-

-		// Casimir666 : if fullscreen was on, put it on back

-		if (!m_fFullScreen && s.fLastFullScreen) {

-			ToggleFullscreen(true, true);

-		}

 	}

 

 	if (s.fSavePnSZoom) {

@@ -9546,6 +9533,22 @@ void CMainFrame::SetDefaultWindowRect(int iMonitor)
 	}

 }

 

+void CMainFrame::SetDefaultFullscreenState()

+{

+	AppSettings& s = AfxGetAppSettings();

+

+	// Waffs : fullscreen command line

+	if (!(s.nCLSwitches&CLSW_ADD) && (s.nCLSwitches&CLSW_FULLSCREEN) && !s.slFiles.IsEmpty()) {

+		ToggleFullscreen(true, true);

+		SetCursor(NULL);

+		AfxGetAppSettings().nCLSwitches &= ~CLSW_FULLSCREEN;

+		m_fFirstFSAfterLaunchOnFS = true;

+	} else if (s.fRememberWindowSize && s.fRememberWindowPos && !m_fFullScreen && s.fLastFullScreen) {

+		// Casimir666 : if fullscreen was on, put it on back

+		ToggleFullscreen(true, true);

+	}

+}

+

 void CMainFrame::RestoreDefaultWindowRect()

 {

 	AppSettings& s = AfxGetAppSettings();

diff --git a/src/apps/mplayerc/MainFrm.h b/src/apps/mplayerc/MainFrm.h
index d2521ff68..c0e9b600a 100644
--- a/src/apps/mplayerc/MainFrm.h
+++ b/src/apps/mplayerc/MainFrm.h
@@ -243,6 +243,7 @@ class CMainFrame : public CFrameWnd, public CDropTarget
 	void ShowControls(int nCS, bool fSave = true);

 

 	void SetDefaultWindowRect(int iMonitor = 0);

+	void SetDefaultFullscreenState();

 	void RestoreDefaultWindowRect();

 	void ZoomVideoWindow(bool snap = true, double scale = -1);

 	double GetZoomAutoFitScale();

diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp
index f2e249484..cea14f468 100644
--- a/src/apps/mplayerc/mplayerc.cpp
+++ b/src/apps/mplayerc/mplayerc.cpp
@@ -1187,6 +1187,7 @@ BOOL CMPlayerCApp::InitInstance()
 	}

 	pFrame->SetDefaultWindowRect((m_s.nCLSwitches&CLSW_MONITOR)?m_s.iMonitor:0);

 	pFrame->RestoreFloatingControlBars();

+	pFrame->SetDefaultFullscreenState();

 	pFrame->SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), TRUE);

 	pFrame->DragAcceptFiles();

 	pFrame->ShowWindow((m_s.nCLSwitches&CLSW_MINIMIZED)?SW_SHOWMINIMIZED:SW_SHOW);