Make UI look flatter (6)

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index f66cd05..8037dd3 100644 (file)
--- 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 6129e0f..5d05766 100644 (file)
--- 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 b958a8d..905510f 100644 (file)
--- a/Src/MergeFrameCommon.cpp
+++ b/Src/MergeFrameCommon.cpp
@@ -9,6 +9,7 @@
 #include "OptionsDef.h"\r
 #include "OptionsMgr.h"\r
 #include "Merge.h"\r
+#include <../src/mfc/afximpl.h>\r
 \r
 IMPLEMENT_DYNCREATE(CMergeFrameCommon, CMDIChildWnd)\r
 \r
@@ -68,6 +69,17 @@ void CMergeFrameCommon::SaveWindowState()
        }\r
 }\r
 \r
+void CMergeFrameCommon::RemoveBarBorder()\r
+{\r
+       afxData.cxBorder2 = 0;\r
+       afxData.cyBorder2 = 0;\r
+       for (int i = 0; i < 4; ++i)\r
+       {\r
+               CControlBar* pBar = GetControlBar(i + AFX_IDW_DOCKBAR_TOP);\r
+               pBar->SetBarStyle(pBar->GetBarStyle() & ~(CBRS_BORDER_ANY | CBRS_BORDER_3D));\r
+       }\r
+}\r
+\r
 /**\r
  * @brief Reflect comparison result in window's icon.\r
  * @param nResult [in] Last comparison result which the application returns.\r

diff --git a/Src/MergeFrameCommon.h b/Src/MergeFrameCommon.h
index 24daf45..271062a 100644 (file)
--- a/Src/MergeFrameCommon.h
+++ b/Src/MergeFrameCommon.h
@@ -16,6 +16,7 @@ public:
        void SetLastCompareResult(int nResult);\r
        void SaveWindowState();\r
        void SetSharedMenu(HMENU hMenu) { m_hMenuShared = hMenu; }\r
+       void RemoveBarBorder();\r
        virtual BOOL IsTabbedMDIChild()\r
        {\r
                return TRUE; // https://stackoverflow.com/questions/35553955/getting-rid-of-3d-look-of-mdi-frame-window\r