From ca7ecd3efb43accdf28bc83a747f2936f5dd74e7 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 9 Aug 2020 23:59:03 +0900
Subject: [PATCH] Make UI look flatter (6)

---
 Src/ImgMergeFrm.cpp      |  5 ++++-
 Src/MergeEditFrm.cpp     |  9 +--------
 Src/MergeFrameCommon.cpp | 12 ++++++++++++
 Src/MergeFrameCommon.h   |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index f66cd0552..8037dd3b8 100644
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -209,6 +209,8 @@ bool CImgMergeFrame::OpenDocs(int nFiles, const FileLocation fileloc[], const bo
 	ShowWindow(nCmdShow);
 	BringToTop(nCmdShow);
 
+	GetParent()->ModifyStyleEx(WS_EX_CLIENTEDGE, 0, SWP_DRAWFRAME);
+
 	OnRefresh();
 
 	if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST))
@@ -466,12 +468,13 @@ void CImgMergeFrame::TranslateLocationPane(int id, const wchar_t *org, size_t ds
 
 int CImgMergeFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
-
 	if (CMergeFrameCommon::OnCreate(lpCreateStruct) == -1)
 		return -1;
 
 	EnableDocking(CBRS_ALIGN_TOP | CBRS_ALIGN_BOTTOM | CBRS_ALIGN_LEFT | CBRS_ALIGN_RIGHT);
 
+	CMergeFrameCommon::RemoveBarBorder();
+
 	// Merge frame has a header bar at top
 	if (!m_wndFilePathBar.Create(this))
 	{
diff --git a/Src/MergeEditFrm.cpp b/Src/MergeEditFrm.cpp
index 6129e0fe6..5d0576613 100644
--- a/Src/MergeEditFrm.cpp
+++ b/Src/MergeEditFrm.cpp
@@ -21,7 +21,6 @@
 #include "DiffViewBar.h"
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
-#include <../src/mfc/afximpl.h>
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -168,13 +167,7 @@ int CMergeEditFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 	EnableDocking(CBRS_ALIGN_TOP|CBRS_ALIGN_BOTTOM|CBRS_ALIGN_LEFT|CBRS_ALIGN_RIGHT);
 
-	afxData.cxBorder2 = 0;
-	afxData.cyBorder2 = 0;
-	for (int i = 0; i < 4; ++i)
-	{
-		CControlBar* pBar = GetControlBar(i + AFX_IDW_DOCKBAR_TOP);
-		pBar->SetBarStyle(pBar->GetBarStyle() & ~(CBRS_BORDER_ANY | CBRS_BORDER_3D));
-	}
+	RemoveBarBorder();
 
 	// Merge frame has a header bar at top
 	if (!m_wndFilePathBar.Create(this))
diff --git a/Src/MergeFrameCommon.cpp b/Src/MergeFrameCommon.cpp
index b958a8d17..905510f65 100644
--- a/Src/MergeFrameCommon.cpp
+++ b/Src/MergeFrameCommon.cpp
@@ -9,6 +9,7 @@
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "Merge.h"
+#include <../src/mfc/afximpl.h>
 
 IMPLEMENT_DYNCREATE(CMergeFrameCommon, CMDIChildWnd)
 
@@ -68,6 +69,17 @@ void CMergeFrameCommon::SaveWindowState()
 	}
 }
 
+void CMergeFrameCommon::RemoveBarBorder()
+{
+	afxData.cxBorder2 = 0;
+	afxData.cyBorder2 = 0;
+	for (int i = 0; i < 4; ++i)
+	{
+		CControlBar* pBar = GetControlBar(i + AFX_IDW_DOCKBAR_TOP);
+		pBar->SetBarStyle(pBar->GetBarStyle() & ~(CBRS_BORDER_ANY | CBRS_BORDER_3D));
+	}
+}
+
 /**
  * @brief Reflect comparison result in window's icon.
  * @param nResult [in] Last comparison result which the application returns.
diff --git a/Src/MergeFrameCommon.h b/Src/MergeFrameCommon.h
index 24daf45a8..271062a27 100644
--- a/Src/MergeFrameCommon.h
+++ b/Src/MergeFrameCommon.h
@@ -16,6 +16,7 @@ public:
 	void SetLastCompareResult(int nResult);
 	void SaveWindowState();
 	void SetSharedMenu(HMENU hMenu) { m_hMenuShared = hMenu; }
+	void RemoveBarBorder();
 	virtual BOOL IsTabbedMDIChild()
 	{
 		return TRUE; // https://stackoverflow.com/questions/35553955/getting-rid-of-3d-look-of-mdi-frame-window
-- 
2.11.0