More changes for bottom button theming

CP_Main.rc

@@ -1343,6 +1343,8 @@ Search_24               PNG                     "res\\Search_24.png"
 
 Search_32               PNG                     "res\\Search_32.png"
 
+search_close_16         PNG                     "res\\search_close_16.png"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //

CP_Main.vcxproj

@@ -2099,6 +2099,7 @@
     <None Include="res\search_close.bmp" />
     <None Include="res\search_close_125.bmp" />
     <None Include="res\search_close_150.bmp" />
+    <None Include="res\search_close_16.png" />
     <None Include="res\search_close_200.bmp" />
     <None Include="res\search_normal.bmp" />
     <None Include="res\search_normal_125.bmp" />

CP_Main.vcxproj.filters

@@ -1211,6 +1211,7 @@
     <None Include="res\Search_20.png" />
     <None Include="res\Search_24.png" />
     <None Include="res\Search_32.png" />
+    <None Include="res\search_close_16.png" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="sqlite">

DittoSetup/BuildDitto.bld

@@ -523,7 +523,6 @@ var sc_security="b3f57099";
 			<FileIn>%workDir%\%branch%\DittoSetup\output\changes.php</FileIn>
 			<Find>Starting Build.*--------------------</Find>
 			<NoModS type='11'>-1</NoModS>
-			<checked type='11'>0</checked>
 			<indent type='3'>2</indent>
 			<name>Replace "Starting Build"</name>
 		</step>

DittoWindow.cpp

@@ -30,6 +30,7 @@ CDittoWindow::CDittoWindow(void)
 	m_CaptionColorLeft = RGB(255, 255, 255);
 	m_CaptionColorRight = RGB(204, 204, 204);
 	m_CaptionTextColor = RGB(191, 191, 191);
+	m_border = RGB(204, 204, 204);
 	m_sendWMClose = true;
 	m_customWindowTitle = _T("");
 	m_useCustomWindowTitle = false;
@@ -56,7 +57,7 @@ void CDittoWindow::DoCreate(CWnd *pWnd)
 	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_windowIcon.LoadStdImageDPI(NewWindowIcon_24_14, NewWindowIcon_30, NewWindowIcon_36, NewWindowIcon_48, _T("PNG"));
+	//m_windowIcon.LoadStdImageDPI(NewWindowIcon_24_14, NewWindowIcon_30, NewWindowIcon_36, NewWindowIcon_48, _T("PNG"));
 }
 
 void CDittoWindow::DoNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp)
@@ -233,7 +234,7 @@ void CDittoWindow::DoNcPaint(CWnd *pWnd)
 
 	for (int x = 0; x < border; x++)
 	{
-		dc.Draw3dRect(rcBorder, m_CaptionColorRight, m_CaptionColorRight);
+		dc.Draw3dRect(rcBorder, m_border, m_border);
 		rcBorder.DeflateRect(1, 1, 1, 1);
 	}
 
@@ -272,7 +273,7 @@ void CDittoWindow::DoNcPaint(CWnd *pWnd)
 	BOOL bVertical = FALSE;
 	if(m_lRightBorder == CAPTION_BORDER)
 	{
-		rightRect.SetRect(rcBorder.right - CAPTION_BORDER+ border, leftRect.top, rcBorder.right, rcBorder.top + IndexToPos(index, false));
+		rightRect.SetRect(rcBorder.right - CAPTION_BORDER+ border, rcBorder.top, rcBorder.right, rcBorder.top + IndexToPos(index, false));
 		leftRect.SetRect(rcBorder.right - CAPTION_BORDER+ border, rcBorder.top + IndexToPos(index, false) + 1, rcBorder.right, rcBorder.bottom);
 		
 		textRect.SetRect(rcBorder.right + theApp.m_metrics.ScaleX(2), rightRect.bottom + theApp.m_metrics.ScaleX(10), rcBorder.right - CAPTION_BORDER + theApp.m_metrics.ScaleX(0), rcBorder.bottom - theApp.m_metrics.ScaleX(50));
@@ -292,7 +293,7 @@ void CDittoWindow::DoNcPaint(CWnd *pWnd)
 	}
 	else if(m_lLeftBorder == CAPTION_BORDER)
 	{
-		rightRect.SetRect(rcBorder.left, leftRect.top, rcBorder.left + CAPTION_BORDER - border, rcBorder.top + IndexToPos(index, false));
+		rightRect.SetRect(rcBorder.left, rcBorder.top, rcBorder.left + CAPTION_BORDER - border, rcBorder.top + IndexToPos(index, false));
 		leftRect.SetRect(rcBorder.left, rcBorder.top + IndexToPos(index, false) + 1, rcBorder.left + CAPTION_BORDER - border, rcBorder.bottom);
 
 		textRect.SetRect(rcBorder.left + CAPTION_BORDER - theApp.m_metrics.ScaleX(0), rightRect.bottom + theApp.m_metrics.ScaleX(10), rcBorder.left - theApp.m_metrics.ScaleX(5), rcBorder.bottom - theApp.m_metrics.ScaleX(50));
@@ -595,7 +596,7 @@ void CDittoWindow::DrawChevronBtn(CWindowDC &dc, CWnd *pWnd)
 
 void CDittoWindow::DrawWindowIcon(CWindowDC &dc, CWnd *pWnd)
 {
-	m_windowIcon.Draw(&dc, pWnd, m_crWindowIconBT.left, m_crWindowIconBT.top, false, false);
+	//m_windowIcon.Draw(&dc, pWnd, m_crWindowIconBT.left, m_crWindowIconBT.top, false, false);
 }
 
 void CDittoWindow::DrawCloseBtn(CWindowDC &dc, CWnd *pWnd)
@@ -854,10 +855,11 @@ void CDittoWindow::SetCaptionOn(CWnd *pWnd, int nPos, bool bOnstartup)
 	pWnd->RedrawWindow();
 }
 
-bool CDittoWindow::SetCaptionColors(COLORREF left, COLORREF right)
+bool CDittoWindow::SetCaptionColors(COLORREF left, COLORREF right, COLORREF border)
 {
 	m_CaptionColorLeft = left;
 	m_CaptionColorRight = right;
+	m_border = border;
 
 	return true;
 }

DittoWindow.h

@@ -31,7 +31,7 @@ public:
 	void DoNcMouseMove(CWnd *pWnd, UINT nHitTest, CPoint point) ;
 	bool DoPreTranslateMessage(MSG* pMsg);
 	void SetCaptionOn(CWnd *pWnd, int nPos, bool bOnstartup);
-	bool SetCaptionColors(COLORREF left, COLORREF right);
+	bool SetCaptionColors(COLORREF left, COLORREF right, COLORREF border);
 	void SetCaptionTextColor(COLORREF color);
 
 	long m_lTopBorder;
@@ -68,6 +68,7 @@ public:
 	COLORREF m_CaptionColorLeft;
 	COLORREF m_CaptionColorRight;
 	COLORREF m_CaptionTextColor;
+	COLORREF m_border;
 	
 	CGdiImageDrawer m_closeButton;
 	CGdiImageDrawer m_chevronRightButton;
@@ -75,7 +76,7 @@ public:
 	CGdiImageDrawer m_chevronTopButton;
 	CGdiImageDrawer m_chevronBottomButton;
 	CGdiImageDrawer m_maximizeButton;
-	CGdiImageDrawer m_windowIcon;
+	//CGdiImageDrawer m_windowIcon;
 
 	CString m_customWindowTitle;
 	bool m_useCustomWindowTitle;

EditFrameWnd.cpp

@@ -60,7 +60,7 @@ int CEditFrameWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 	m_DittoWindow.DoCreate(this);
 	m_DittoWindow.m_bDrawChevron = false;
-	m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight());
+	m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight(), g_Opt.m_Theme.Border());
 	m_DittoWindow.SetCaptionOn(this, CAPTION_TOP, true);
 
 	m_crIcon.SetRect(-2, -15, 15, 0);

QPasteWnd.cpp

@@ -370,7 +370,8 @@ int CQPasteWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
     #endif 
 
 
-    m_SearchFont.CreatePointFont(120, _T("Segoe UI"));
+    //m_SearchFont.CreatePointFont(100, _T("Segoe UI"));
+	m_SearchFont.CreateFont(-theApp.m_metrics.PointsToPixels(12), 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 3, 2, 1, 34, _T("Segoe UI"));
     m_search.SetFont(&m_SearchFont);
 	m_search.SetPromptFont(m_SearchFont);
 

QRCodeViewer.cpp

@@ -58,7 +58,7 @@ BOOL QRCodeViewer::CreateEx(CWnd *pParentWnd, unsigned char* bitmapData, int ima
 		m_desc.SetFont(&m_font);	
 
 		m_DittoWindow.DoCreate(this);
-		m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight());
+		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_bDrawMaximize = true;

Resource.h

@@ -152,6 +152,8 @@
 #define IDB_PNG15                       296
 #define Search_32                       296
 #define IDI_ICON2                       297
+#define IDB_PNG11                       298
+#define search_close_16                 298
 #define IDC_PATH                        1000
 #define IDC_GET_PATH                    1001
 #define IDC_SELECT_SOUND                1002
@@ -630,7 +632,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        298
+#define _APS_NEXT_RESOURCE_VALUE        299
 #define _APS_NEXT_COMMAND_VALUE         32929
 #define _APS_NEXT_CONTROL_VALUE         2146
 #define _APS_NEXT_SYMED_VALUE           104

SymbolEdit.cpp

@@ -35,7 +35,8 @@ CSymbolEdit::CSymbolEdit() :
 	m_editFocusBrush.CreateSolidBrush(m_editFocusColor);
 	m_editNonFocusBrush.CreateSolidBrush(m_editNonFocusColor);
 
-	m_searchButton.LoadStdImageDPI(Search_16, Search_20, Search_24, Search_32, _T("PNG"));
+	//m_searchButton.LoadStdImageDPI(Search_16, Search_20, Search_24, Search_32, _T("PNG"));
+	m_closeButton.LoadStdImageDPI(search_close_16, Search_20, Search_24, Search_32, _T("PNG"));
 }
 
 CSymbolEdit::~CSymbolEdit()
@@ -303,13 +304,20 @@ void CSymbolEdit::OnPaint()
 			COLORREF color = dc.GetTextColor();
 			dc.SetTextColor(m_colorPromptText);
 			
-			dc.DrawText(m_strPromptText, textRect, DT_LEFT | DT_SINGLELINE | DT_EDITCONTROL);
+			dc.DrawText(m_strPromptText, textRect, DT_LEFT | DT_SINGLELINE | DT_EDITCONTROL | DT_VCENTER);
 			dc.SetTextColor(color);
 			dc.SelectObject(oldFont);
 		}
 	}
 
-	m_searchButton.Draw(&dc, this, rect.right - 22, 4, false, false);
+	if (text.GetLength() > 0)
+	{
+		m_closeButton.Draw(&dc, this, rect.right - 22, 4, false, false);
+	}
+	else
+	{
+		//m_searchButton.Draw(&dc, this, rect.right - 22, 4, false, false);
+	}
 
 	//OutputDebugString(_T("OnPaint"));
 

SymbolEdit.h

@@ -66,7 +66,8 @@ protected:
 	CBrush m_editFocusBrush;
 	CBrush m_editNonFocusBrush;
 
-	CGdiImageDrawer m_searchButton;
+	//CGdiImageDrawer m_searchButton;
+	CGdiImageDrawer m_closeButton;
 
 	void RecalcLayout();
 	virtual void PreSubclassWindow();

Theme.cpp

@@ -13,13 +13,18 @@ CTheme::CTheme(void)
 
 	m_CaptionLeft = RGB(255, 255, 255);
 	m_CaptionRight = RGB(204, 204, 204);
+	
+	m_Border = RGB(204, 204, 204);
+	m_BorderTopMost = RGB(100, 100, 100);
+	m_BorderNotConnected = RGB(255, 0, 0);
+
 	m_CaptionLeftTopMost = RGB(255, 255, 255);
-	m_CaptionRightTopMost = RGB(100, 100, 100);
+	m_CaptionRightTopMost = RGB(204, 204, 204);
 	m_CaptionLeftNotConnected = RGB(255, 255, 255);
-	m_CaptionRightNotConnected = RGB(255, 0, 0);
+	m_CaptionRightNotConnected = RGB(204, 204, 204);
 	m_CaptionTextColor = RGB(191, 191, 191);
 	m_ListBoxOddRowsBG = RGB(255, 255, 255);
-	m_ListBoxEvenRowsBG = RGB(240, 240, 240);
+	m_ListBoxEvenRowsBG = RGB(250, 250, 250);
 	m_ListBoxOddRowsText = RGB(0, 0, 0);
 	m_ListBoxEvenRowsText = RGB(0, 0, 0);
 	m_ListBoxSelectedBG = RGB(204, 204, 204);

Theme.h

@@ -13,6 +13,9 @@ public:
 
 	COLORREF CaptionLeft() const { return m_CaptionLeft; }
 	COLORREF CaptionRight() const { return m_CaptionRight; }
+	COLORREF Border() const { return m_Border; }
+	COLORREF BorderTopMost() const { return m_BorderTopMost; }
+	COLORREF BorderNotConnected() const { return m_BorderNotConnected; }
 	COLORREF CaptionLeftTopMost() const { return m_CaptionLeftTopMost; }
 	COLORREF CaptionRightTopMost() const { return m_CaptionRightTopMost; }
 	COLORREF CaptionLeftNotConnected() const { return m_CaptionLeftNotConnected; }
@@ -61,6 +64,9 @@ protected:
 	COLORREF m_clipPastedColor;
 	COLORREF m_listSmallQuickPasteIndexColor;
 	COLORREF m_mainWindowBG;
+	COLORREF m_Border;
+	COLORREF m_BorderTopMost;
+	COLORREF m_BorderNotConnected;
 
 	CString m_csLastError;
 	long m_lFileVersion;

ToolTipEx.cpp

@@ -84,7 +84,7 @@ BOOL CToolTipEx::Create(CWnd *pParentWnd)
 	
 	
 	m_DittoWindow.DoCreate(this);
-	m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight());
+	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;

WndEx.cpp

@@ -112,17 +112,17 @@ bool CWndEx::SetCaptionColorActive(BOOL bPersistant, BOOL ConnectedToClipboard)
 
 	if(ConnectedToClipboard == false)
 	{
-		bResult = m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeftNotConnected(), g_Opt.m_Theme.CaptionRightNotConnected());
+		bResult = m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeftNotConnected(), g_Opt.m_Theme.CaptionRightNotConnected(), g_Opt.m_Theme.BorderNotConnected());
 	}
 	else
 	{
 		if(bPersistant)
 		{
-			bResult = m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeftTopMost(), g_Opt.m_Theme.CaptionRightTopMost());
+			bResult = m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeftTopMost(), g_Opt.m_Theme.CaptionRightTopMost(), g_Opt.m_Theme.BorderTopMost());
 		}
 		else
 		{
-			bResult = m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight());
+			bResult = m_DittoWindow.SetCaptionColors(g_Opt.m_Theme.CaptionLeft(), g_Opt.m_Theme.CaptionRight(), g_Opt.m_Theme.Border());
 		}
 	}