From 18321045e0101a6364fa999358a8c31463435418 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Mon, 11 Feb 2013 17:34:04 +0800 Subject: [PATCH] Fixed issue #1643: TortoiseGitMerge window do not maximize correctly on screeen with right-side docked start bar Signed-off-by: Sup Yut Sum --- src/Changelog.txt | 1 + src/TortoiseMerge/MainFrm.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/Changelog.txt b/src/Changelog.txt index af7c45e13..e20ce651e 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -12,6 +12,7 @@ Released: unreleased == Bug Fixes == * Fixed issue #1642: Incorrect behavior if repo is located on root of drive + * Fixed issue #1643: TortoiseGitMerge window do not maximize correctly on screeen with right-side docked start bar = Release 1.8.1.0 = Released: 2013-02-07 diff --git a/src/TortoiseMerge/MainFrm.cpp b/src/TortoiseMerge/MainFrm.cpp index adf2fd1c6..ca943cd07 100644 --- a/src/TortoiseMerge/MainFrm.cpp +++ b/src/TortoiseMerge/MainFrm.cpp @@ -933,6 +933,15 @@ void CMainFrame::OnSize(UINT nType, int cx, int cy) m_bCheckReload = false; CheckForReload(); } + + // workaround for ribbon interface when taskbar is on the left/top + if (nType == SIZE_MAXIMIZED) + { + WINDOWPLACEMENT wp; + GetWindowPlacement(&wp); + wp.ptMaxPosition.x = wp.ptMaxPosition.y = 0; + SetWindowPlacement(&wp); + } } void CMainFrame::OnViewWhitespaces() -- 2.11.4.GIT