Added min and max icons

CP_Main.rc

@@ -1345,6 +1345,20 @@ Search_32               PNG                     "res\\Search_32.png"
 
 search_close_16         PNG                     "res\\search_close_16.png"
 
+minimize_16             PNG                     "res\\minimize_16.png"
+
+minimize_32             PNG                     "res\\minimize_32.png"
+
+minimize_24             PNG                     "res\\minimize_24.png"
+
+minimize_20             PNG                     "res\\minimize_20.png"
+
+maximize_32             PNG                     "res\\maximize_32.png"
+
+maximize_24             PNG                     "res\\maximize_24.png"
+
+maximize_20             PNG                     "res\\maximize_20.png"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //

CP_Main.vcxproj

@@ -2071,7 +2071,14 @@
     <None Include="res\maximize_10_10.png" />
     <None Include="res\maximize_12_12.png" />
     <None Include="res\maximize_16_16.png" />
+    <None Include="res\maximize_20.png" />
+    <None Include="res\maximize_24.png" />
+    <None Include="res\maximize_32.png" />
     <None Include="res\maximize_8_8.png" />
+    <None Include="res\minimize_16.png" />
+    <None Include="res\minimize_20.png" />
+    <None Include="res\minimize_24.png" />
+    <None Include="res\minimize_32.png" />
     <None Include="res\NewWindowIcon_24_14.png" />
     <None Include="res\NewWindowIcon_30.png" />
     <None Include="res\NewWindowIcon_36.png" />

CP_Main.vcxproj.filters

@@ -1212,6 +1212,13 @@
     <None Include="res\Search_24.png" />
     <None Include="res\Search_32.png" />
     <None Include="res\search_close_16.png" />
+    <None Include="res\minimize_16.png" />
+    <None Include="res\minimize_32.png" />
+    <None Include="res\minimize_24.png" />
+    <None Include="res\minimize_20.png" />
+    <None Include="res\maximize_32.png" />
+    <None Include="res\maximize_24.png" />
+    <None Include="res\maximize_20.png" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="sqlite">

DittoWindow.cpp

@@ -53,10 +53,8 @@ void CDittoWindow::DoCreate(CWnd *pWnd)
 	m_closeButton.LoadStdImageDPI(Close_Black_16_16, Close_Black_20_20, Close_Black_24_24, Close_Black_32_32, _T("PNG"));
 	m_chevronRightButton.LoadStdImageDPI(ChevronRight_Black_16_16, ChevronRight_Black_24_24, ChevronRight_Black_24_24, ChevronRight_Black_32_32, _T("PNG"));
 	m_chevronLeftButton.LoadStdImageDPI(ChevronLeft_Black_16_16, ChevronLeft_Black_24_24, ChevronLeft_Black_24_24, ChevronLeft_Black_32_32, _T("PNG"));
-	m_chevronTopButton.LoadStdImageDPI(IDB_CHEVRON_TOP_8_8, IDB_CHEVRON_TOP_10_10, IDB_CHEVRON_TOP_12_12, IDB_CHEVRON_TOP_16_16, _T("PNG"));
-	m_chevronBottomButton.LoadStdImageDPI(IDB_CHEVRON_BOTTOM_8_8, IDB_CHEVRON_BOTTOM_10_10, IDB_CHEVRON_BOTTOM_12_12, IDB_CHEVRON_BOTTOM_16_16, _T("PNG"));
-	m_maximizeButton.LoadStdImageDPI(IDB_MAXIMIZE_8_8, IDB_MAXIMIZE_10_10, IDB_MAXIMIZE_12_12, IDB_MAXIMIZE_16_16, _T("PNG"));
-
+	m_maximizeButton.LoadStdImageDPI(IDB_MAXIMIZE_16_16, maximize_20, maximize_24, maximize_32, _T("PNG"));
+	m_minimizeButton.LoadStdImageDPI(minimize_16, minimize_20, minimize_24, minimize_32, _T("PNG"));
 	//m_windowIcon.LoadStdImageDPI(NewWindowIcon_24_14, NewWindowIcon_30, NewWindowIcon_36, NewWindowIcon_48, _T("PNG"));
 }
 
@@ -510,6 +508,8 @@ void CDittoWindow::DoNcPaint(CWnd *pWnd)
 	DrawWindowIcon(dc, pWnd);
 	DrawChevronBtn(dc, pWnd);
 	DrawCloseBtn(dc, pWnd);
+	DrawMaximizeBtn(dc, pWnd);
+	DrawMinimizeBtn(dc, pWnd);
 }
 
 void CDittoWindow::DoSetRegion(CWnd *pWnd)
@@ -609,46 +609,14 @@ void CDittoWindow::DrawCloseBtn(CWindowDC &dc, CWnd *pWnd)
 	m_closeButton.Draw(&dc, pWnd, m_crCloseBT.left, m_crCloseBT.top, m_bMouseOverClose, m_bMouseDownOnClose);
 }
 
-void CDittoWindow::DrawMinimizeBtn(CWindowDC &dc)
+void CDittoWindow::DrawMinimizeBtn(CWindowDC &dc, CWnd *pWnd)
 {
 	if(m_bDrawMinimize == false)
 	{
 		return;
 	}
 
-	//rows first then columns
-	int Points[5][6] =
-	{
-			0,0,0,0,0,0,
-			0,0,0,0,0,0,
-			0,0,0,0,0,0,
-			1,1,1,1,1,0,
-			1,1,1,1,1,0
-	};
-
-	CPoint ptShift = m_crMinimizeBT.TopLeft();
-	ptShift.Offset(3, 3);
-
-	if(m_bMouseDownOnMinimize)
-	{
-		dc.Draw3dRect(m_crMinimizeBT, RGB(255, 255, 255), RGB(255, 255, 255));
-		CRect cr(m_crMinimizeBT);
-		cr.DeflateRect(1, 1, 1, 1);
-		dc.Draw3dRect(cr, RGB(255, 255, 255), RGB(255, 255, 255));
-	}
-	else if(m_bMouseOverMinimize)
-	{
-		dc.Draw3dRect(m_crMinimizeBT, RGB(255, 255, 255), RGB(255, 255, 255));
-	}
-
-	for (int iRow = 0; iRow < 5; iRow++)
-	{
-		for (int iCol = 0; iCol < 6; iCol++)
-		{
-			if (Points[iRow][iCol] == 1)
-				dc.SetPixel(ptShift+CPoint(iCol, iRow), RGB(255, 255, 255));
-		}
-	}
+	m_minimizeButton.Draw(&dc, pWnd, m_crMinimizeBT.left, m_crMinimizeBT.top, m_bMouseOverClose, m_bMouseDownOnClose);
 }
 
 void CDittoWindow::DrawMaximizeBtn(CWindowDC &dc, CWnd *pWnd)

DittoWindow.h

@@ -19,7 +19,7 @@ public:
 	void DrawChevronBtn(CWindowDC &dc, CWnd *pWnd);
 	void DrawCloseBtn(CWindowDC &dc, CWnd *pWnd);
 	void DrawMaximizeBtn(CWindowDC &dc, CWnd *pWnd);
-	void DrawMinimizeBtn(CWindowDC &dc);
+	void DrawMinimizeBtn(CWindowDC &dc, CWnd *pWnd);
 	void DrawWindowIcon(CWindowDC &dc, CWnd *pWnd);
 
 	void DoCreate(CWnd *pWnd);
@@ -73,9 +73,8 @@ public:
 	CGdiImageDrawer m_closeButton;
 	CGdiImageDrawer m_chevronRightButton;
 	CGdiImageDrawer m_chevronLeftButton;
-	CGdiImageDrawer m_chevronTopButton;
-	CGdiImageDrawer m_chevronBottomButton;
 	CGdiImageDrawer m_maximizeButton;
+	CGdiImageDrawer m_minimizeButton;
 	//CGdiImageDrawer m_windowIcon;
 
 	CString m_customWindowTitle;

Resource.h

@@ -156,6 +156,14 @@
 #define IDB_PNG11                       298
 #define search_close_16                 298
 #define IDB_FOLDER                      300
+#define minimize_16                     301
+#define minimize_32                     302
+#define minimize_24                     303
+#define minimize_20                     304
+#define maximize_32                     305
+#define maximize_24                     306
+#define IDB_PNG17                       307
+#define maximize_20                     307
 #define IDC_PATH                        1000
 #define IDC_GET_PATH                    1001
 #define IDC_SELECT_SOUND                1002
@@ -634,7 +642,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        301
+#define _APS_NEXT_RESOURCE_VALUE        308
 #define _APS_NEXT_COMMAND_VALUE         32929
 #define _APS_NEXT_CONTROL_VALUE         2146
 #define _APS_NEXT_SYMED_VALUE           104

SymbolEdit.cpp

@@ -300,6 +300,7 @@ void CSymbolEdit::OnPaint()
 		dc.FillSolidRect(rect, g_Opt.m_Theme.MainWindowBG());
 	}
 
+
 	if (text.GetLength() == 0 && m_strPromptText.GetLength() > 0)
 	{
 		oldFont = dc.SelectObject(&m_fontPrompt);

ToolTipEx.cpp

@@ -86,8 +86,8 @@ BOOL CToolTipEx::Create(CWnd *pParentWnd)
 	m_DittoWindow.DoCreate(this);
 	m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight(), g_Opt.m_Theme.Border());
 	m_DittoWindow.SetCaptionOn(this, CGetSetOptions::GetCaptionPos(), true);
-	m_DittoWindow.m_bDrawMinimize = false;
-	m_DittoWindow.m_bDrawMinimize = false;
+	m_DittoWindow.m_bDrawMaximize = true;
+	m_DittoWindow.m_bDrawMinimize = true;
 	m_DittoWindow.m_bDrawChevron = false;
 	m_DittoWindow.m_sendWMClose = false;