From 3ca453435c08393561a82c8bed6a57ad0bbfd573 Mon Sep 17 00:00:00 2001
From: katsuhisa yuasa <berupon@gmail.com>
Date: Wed, 8 Sep 2021 00:03:16 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=84=E3=83=BC=E3=83=AB=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E4=B8=8A=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=9C=E3=83=9C=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=82=B9=E3=82=92=E4=BD=9C=E6=88=90=E5=BE=8C=E3=81=AB?=
 =?UTF-8?q?=E6=A8=AA=E5=B9=85=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=81=AE=E3=81=A7=E3=81=AF=E3=81=AA=E3=81=8F=E3=80=81CreateWin?=
 =?UTF-8?q?dow=E3=80=80=E3=81=AB=E6=B8=A1=E3=81=99=E5=80=A4=E3=82=92?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4=20=E3=82=AD=E3=83=BC=E3=83=9C=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=83=95=E3=82=A9=E3=83=BC=E3=82=AB=E3=82=B9=E3=81=8C?=
 =?UTF-8?q?=E5=BD=93=E3=81=9F=E3=81=A3=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=81=AB=E3=82=82=E3=81=8B=E3=81=8B=E3=82=8F=E3=82=89=E3=81=9A?=
 =?UTF-8?q?=EF=BC=8C=E6=96=87=E5=AD=97=E5=88=97=E3=81=8C=E9=81=B8=E6=8A=9E?=
 =?UTF-8?q?=E7=8A=B6=E6=85=8B=E3=81=A8=E3=81=97=E3=81=A6=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E7=8F=BE=E8=B1=A1=E3=81=8C=E8=B5=B7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E7=82=BA=E3=81=AE=E5=AF=BE=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sakura_core/window/CMainToolBar.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sakura_core/window/CMainToolBar.cpp b/sakura_core/window/CMainToolBar.cpp
index 33659b608f..b3d2a4b15d 100644
--- a/sakura_core/window/CMainToolBar.cpp
+++ b/sakura_core/window/CMainToolBar.cpp
@@ -293,6 +293,9 @@ void CMainToolBar::CreateToolBar( void )
 						//位置とサイズを取得する
 						rc.right = rc.left = rc.top = rc.bottom = 0;
 						Toolbar_GetItemRect( m_hwndToolBar, count-1, &rc );
+						// Social Distance
+						rc.left += cxBorder;
+						rc.right -= cxBorder;
 
 						//コンボボックスを作る
 						m_hwndSearchBox = CreateWindow( WC_COMBOBOX, L"Combo",
@@ -334,15 +337,15 @@ void CMainToolBar::CreateToolBar( void )
 
 							CDialog::SetComboBoxDeleter(m_hwndSearchBox, &m_cRecentSearch);
 
-							// コンボボックスの位置と幅を調整する
+							// コンボボックスの垂直位置を調整する
 							CMyRect rcCombo;
 							::GetWindowRect( m_hwndSearchBox, &rcCombo );
 							::SetWindowPos( m_hwndSearchBox, NULL,
-								rc.left + cxBorder,
+								rc.left,	//作ったときと同じ値を指定
 								rc.top + (rc.bottom - rc.top - rcCombo.Height()) / 2,
-								rcCombo.Width() - cxBorder * 2,
-								rcCombo.Height(),
-								SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING );
+								0,			//rcCombo.Width()のまま変えない
+								0,			//rcCombo.Height()のまま変えない
+								SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING );
 						}
 						break;