From: s_kawamoto <s_kawamoto@users.sourceforge.jp>
Date: Sun, 13 Mar 2016 03:21:57 +0000 (+0900)
Subject: Fix bugs of dialog resizing.
X-Git-Url: http://git.osdn.net/view?p=ffftp%2Fffftp.git;a=commitdiff_plain;h=fbfd8ebb10ee9911b07de6634e6b82addb00632e

Fix bugs of dialog resizing.
---

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 1e7fbc2..169980b 100644
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
diff --git a/FFFTP_Eng_Release_64/FFFTP.exe b/FFFTP_Eng_Release_64/FFFTP.exe
index 9b32e12..4bd077c 100644
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ
diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 0bfc0e4..c4f6fcf 100644
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
diff --git a/Release_64/FFFTP.exe b/Release_64/FFFTP.exe
index 1ef25e4..e8ee9bf 100644
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ
diff --git a/bookmark.c b/bookmark.c
index 2a497ee..f781e4d 100644
--- a/bookmark.c
+++ b/bookmark.c
@@ -402,6 +402,8 @@ static INT_PTR CALLBACK EditBookMarkProc(HWND hDlg, UINT message, WPARAM wParam,
 	int Cur;
 	int Max;
 	char Tmp[BMARK_MARK_LEN + FMAX_PATH * 2 + BMARK_SEP_LEN + 1];
+	// バグ修正
+	RECT Rect;
 
 	static DIALOGSIZE DlgSize = {
 		{ BMARK_NEW, BMARK_SET, BMARK_DEL, BMARK_DOWN, BMARK_UP, IDHELP, BMARK_SIZEGRIP, -1 },
@@ -413,6 +415,13 @@ static INT_PTR CALLBACK EditBookMarkProc(HWND hDlg, UINT message, WPARAM wParam,
 
 	switch (message)
 	{
+		// バグ修正
+		case WM_SIZE :
+			GetWindowRect(hDlg, &Rect);
+			DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
+			RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);
+		    break;
+
 		case WM_INITDIALOG :
 			if(ListFont != NULL)
 				SendDlgItemMessage(hDlg, BMARK_LIST, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));
diff --git a/common.h b/common.h
index d9519f4..c985295 100644
--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
 // 2014年7月31日中の30個目のリリースは2014073129
-#define RELEASE_VERSION_NUM		2016030500	/* リリースバージョン */
+#define RELEASE_VERSION_NUM		2016031300	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク
diff --git a/doc/eng/FFFTP.txt b/doc/eng/FFFTP.txt
index 9e4430a..6d9c01a 100644
--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -106,6 +106,8 @@ Changes in Ver.1.99
 
 -- Added an option not to save the user name and password of the firewall.
 
+-- Fixed bugs to disturb the view after resizing of a dialog.
+
 
 Outline
 -------
diff --git a/doc/eng/history.txt b/doc/eng/history.txt
index 0b359ae..62fbadd 100644
--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -78,6 +78,8 @@ Changes in Ver.1.99
 
 -- Added an option not to save the user name and password of the firewall.
 
+-- Fixed bugs to disturb the view after resizing of a dialog.
+
 Changes in Ver.1.98g2
 --------------------
 
diff --git a/doc/jpn/FFFTP.txt b/doc/jpn/FFFTP.txt
index 3fdf5fa..96bf977 100644
--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -110,6 +110,8 @@ Ver 1.99
 
 EFireWallƒ†[ƒU[–¼‚¨‚æ‚уpƒXƒ[ƒh‚ð•Û‘¶‚µ‚È‚¢Ý’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
 
+Eƒ_ƒCƒAƒƒO‚̃TƒCƒY•ÏXŽž‚É•\Ž¦‚ª—‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
+
 
 Ver 1.96dˆÈ‘O‚Ö–ß‚·ê‡
 -----------------------
diff --git a/doc/jpn/history.txt b/doc/jpn/history.txt
index 006ad30..2ffcde4 100644
--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -82,6 +82,8 @@ FFFTP
 
 EFireWallƒ†[ƒU[–¼‚¨‚æ‚уpƒXƒ[ƒh‚ð•Û‘¶‚µ‚È‚¢Ý’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
 
+Eƒ_ƒCƒAƒƒO‚̃TƒCƒY•ÏXŽž‚É•\Ž¦‚ª—‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
+
 ¡Ver 1.98g2
 
 EƒCƒ“ƒXƒg[ƒ‰”Å‚ÉZIP”ł̃tƒ@ƒCƒ‹‚ª¬“ü‚µ‚Ä‚¢‚½–â‘è‚ðC³‚µ‚Ü‚µ‚½B
diff --git a/ftpproc.c b/ftpproc.c
index 13e5d2b..800bac1 100644
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -1862,7 +1862,9 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
 {
 	static DIALOGSIZE DlgSize = {
 		{ MIRROR_DEL, MIRROR_SIZEGRIP, -1 },
-		{ IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, -1 },
+		// ミラーリング設定追加
+//		{ IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, -1 },
+		{ IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, MIRROR_NO_TRANSFER, -1 },
 		{ MIRROR_LIST, -1 },
 		{ 0, 0 },
 		{ 0, 0 }
@@ -1873,9 +1875,18 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
 	char Tmp[FMAX_PATH+1+6];
 	int Num;
 	int *List;
+	// バグ修正
+	RECT Rect;
 
 	switch (iMessage)
 	{
+		// バグ修正
+		case WM_SIZE :
+			GetWindowRect(hDlg, &Rect);
+			DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
+			RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);
+		    break;
+
 		case WM_INITDIALOG :
 			Base = (TRANSPACKET **)lParam;
 			Pos = *Base;
diff --git a/hostman.c b/hostman.c
index a892ec5..e07dee7 100644
--- a/hostman.c
+++ b/hostman.c
@@ -173,9 +173,18 @@ static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, L
 	NM_TREEVIEWW *tView;
 	HTREEITEM tViewPos;
 	TV_HITTESTINFO HitInfo;
+	// バグ修正
+	RECT Rect;
 
 	switch (message)
 	{
+		// バグ修正
+		case WM_SIZE :
+			GetWindowRect(hDlg, &Rect);
+			DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
+			RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);
+		    break;
+
 		case WM_INITDIALOG :
 			/* TreeViewでのダブルクリックをつかまえるため */
 			// 64ビット対応