From 8665e17282f79fefb4191e0db4788de3fdd22d9d Mon Sep 17 00:00:00 2001
From: Zhong Yang <zhongyang219@hotmail.com>
Date: Sun, 12 Jul 2020 00:10:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E4=B8=AD=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84COLORREF=E5=92=8CRGB=E5=80=BC=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=8A=A8=E5=88=A4=E6=96=AD=E8=BF=9B=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=8110=E3=80=818=E3=80=8116=E8=BF=9B?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ColorPicker/ColorPicker.rc     | Bin 28246 -> 28054 bytes
 ColorPicker/ColorPickerDlg.cpp |  12 ++++++------
 ColorPicker/Common.cpp         |  16 ++++++++++++++++
 ColorPicker/Common.h           |   3 +++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/ColorPicker/ColorPicker.rc b/ColorPicker/ColorPicker.rc
index 101e91dfa2bd7c40ca2dcd5c88fa338e78f74bb9..961b7e4ed28cf6e3fd87e9929ed2e4f9a311f685 100644
GIT binary patch
delta 151
zcmcb1hjH3%#tm@_j3$#msu)h@QdHV}O5qmcWHD8}$*+`Ffax2`D<&JcJ8Zt8vPp^A
zlmVgghx-*qW+Mhepw?iZYLFqhp8mq_3_1*^3`RiG97yW`Sr8RBloc2)z$%=8q81Eh
RXetaR+qs);*6`6&0sx5hE*Ag*

delta 301
zcmbPsoAKHm#tm@_lP9RCi7PPFFeos%G6XZkGx#xtGWaq$0eL}_1KssEZ&J9$h*LqL
zvi{^<N-OZlU&kqT(amvlg~}$S$$cssxD;&;bZ2IooT7wN!DNUFR3<O+@|moq%*AZZ
gU^+QbNgJ1eK=r{uwL$C#3_1*i)Ph`?;jO0x0P&JTm;e9(

diff --git a/ColorPicker/ColorPickerDlg.cpp b/ColorPicker/ColorPickerDlg.cpp
index b9dbf5a..59ec5c2 100644
--- a/ColorPicker/ColorPickerDlg.cpp
+++ b/ColorPicker/ColorPickerDlg.cpp
@@ -263,11 +263,11 @@ BOOL CColorPickerDlg::OnInitDialog()
 	SetColorBText();
 	SetColorHexText();
 
-	m_edit.SetLimitText(8);
+	m_edit.SetLimitText(10);
 	m_edit_r.SetLimitText(3);
 	m_edit_g.SetLimitText(3);
 	m_edit_b.SetLimitText(3);
-	m_edit_hex.SetLimitText(6);
+	m_edit_hex.SetLimitText(8);
 
 	m_color_list.SetDrawColorRow(CLC_COLOR);
 	m_color_list.LoadColors((theApp.GetModleDir() + CONFIG_FILE_NAME).c_str());		//从配置文件加载颜色表
@@ -364,7 +364,7 @@ void CColorPickerDlg::OnEnChangeColorValue()
 	{
 		CString str;
 		m_edit.GetWindowText(str);
-		m_color = _wtoi(str);
+		m_color = CCommon::StringToNumber(str);
 		m_color_r = GetRValue(m_color);
 		m_color_g = GetGValue(m_color);
 		m_color_b = GetBValue(m_color);
@@ -390,7 +390,7 @@ void CColorPickerDlg::OnEnChangeColorR()
 	{
 		CString str;
 		m_edit_r.GetWindowText(str);
-		m_color_r = _wtoi(str);
+		m_color_r = CCommon::StringToNumber(str);
 		m_color = RGB(m_color_r, m_color_g, m_color_b);
 		m_color_hex = CColorConvert::RGB2Hex(m_color_r, m_color_g, m_color_b);
 		SetColorRefText();
@@ -412,7 +412,7 @@ void CColorPickerDlg::OnEnChangeColorG()
 	{
 		CString str;
 		m_edit_g.GetWindowText(str);
-		m_color_g = _wtoi(str);
+		m_color_g = CCommon::StringToNumber(str);
 		m_color = RGB(m_color_r, m_color_g, m_color_b);
 		m_color_hex = CColorConvert::RGB2Hex(m_color_r, m_color_g, m_color_b);
 		SetColorRefText();
@@ -434,7 +434,7 @@ void CColorPickerDlg::OnEnChangeColorB()
 	{
 		CString str;
 		m_edit_b.GetWindowText(str);
-		m_color_b = _wtoi(str);
+		m_color_b = CCommon::StringToNumber(str);
 		m_color = RGB(m_color_r, m_color_g, m_color_b);
 		m_color_hex = CColorConvert::RGB2Hex(m_color_r, m_color_g, m_color_b);
 		SetColorRefText();
diff --git a/ColorPicker/Common.cpp b/ColorPicker/Common.cpp
index 5460cc2..18df0bf 100644
--- a/ColorPicker/Common.cpp
+++ b/ColorPicker/Common.cpp
@@ -144,3 +144,19 @@ CString CCommon::LoadTextFormat(UINT id, const std::initializer_list<CVariant>&
 	str.LoadString(id);
 	return StringFormat(str.GetString(), paras);
 }
+
+unsigned int CCommon::StringToNumber(const CString& str)
+{
+    //判断进制
+    int radix{ 10 };
+    if (str.GetLength() >= 3 && str[0] == _T('0') && (str[1] == _T('x') || str[1] == _T('X')))
+    {
+        radix = 16;
+    }
+    else if (str.GetLength() >= 2 && str[0] == _T('0'))
+    {
+        radix = 8;
+    }
+    TCHAR* end_ptr{};
+    return _tcstoul(str.GetString(), &end_ptr, radix);
+}
diff --git a/ColorPicker/Common.h b/ColorPicker/Common.h
index 693c7c4..ae81905 100644
--- a/ColorPicker/Common.h
+++ b/ColorPicker/Common.h
@@ -39,5 +39,8 @@ class CCommon
 	//从资源文件中载入字符串，并将资源字符串中形如<%序号%>的字符串替换成可变参数列表中的参数
 	static CString LoadTextFormat(UINT id, const std::initializer_list<CVariant>& paras);
 
+    //将字符串转换成数字，支持自动识别十六进制、八进制和十进制
+    static unsigned int StringToNumber(const CString& str);
+
 };