• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

FFFTPのソースコードです。


Commit MetaInfo

Revisionfbfd8ebb10ee9911b07de6634e6b82addb00632e (tree)
Zeit2016-03-13 12:21:57
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Log Message

Fix bugs of dialog resizing.

Ändern Zusammenfassung

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ
--- a/bookmark.c
+++ b/bookmark.c
@@ -402,6 +402,8 @@ static INT_PTR CALLBACK EditBookMarkProc(HWND hDlg, UINT message, WPARAM wParam,
402402 int Cur;
403403 int Max;
404404 char Tmp[BMARK_MARK_LEN + FMAX_PATH * 2 + BMARK_SEP_LEN + 1];
405+ // バグ修正
406+ RECT Rect;
405407
406408 static DIALOGSIZE DlgSize = {
407409 { 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,
413415
414416 switch (message)
415417 {
418+ // バグ修正
419+ case WM_SIZE :
420+ GetWindowRect(hDlg, &Rect);
421+ DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
422+ RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);
423+ break;
424+
416425 case WM_INITDIALOG :
417426 if(ListFont != NULL)
418427 SendDlgItemMessage(hDlg, BMARK_LIST, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));
--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
8181 // ソフトウェア自動更新
8282 // リリースバージョンはリリース予定年(10進数4桁)+月(2桁)+日(2桁)+通し番号(0スタート2桁)とする
8383 // 2014年7月31日中の30個目のリリースは2014073129
84-#define RELEASE_VERSION_NUM 2016030500 /* リリースバージョン */
84+#define RELEASE_VERSION_NUM 2016031300 /* リリースバージョン */
8585
8686
8787 // SourceForge.JPによるフォーク
--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -106,6 +106,8 @@ Changes in Ver.1.99
106106
107107 -- Added an option not to save the user name and password of the firewall.
108108
109+-- Fixed bugs to disturb the view after resizing of a dialog.
110+
109111
110112 Outline
111113 -------
--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -78,6 +78,8 @@ Changes in Ver.1.99
7878
7979 -- Added an option not to save the user name and password of the firewall.
8080
81+-- Fixed bugs to disturb the view after resizing of a dialog.
82+
8183 Changes in Ver.1.98g2
8284 --------------------
8385
--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -110,6 +110,8 @@ Ver 1.99
110110
111111 EFireWallƒ†[ƒU[–¼‚¨‚æ‚уpƒXƒ[ƒh‚ð•Û‘¶‚µ‚È‚¢Ý’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
112112
113+Eƒ_ƒCƒAƒƒO‚̃TƒCƒY•ÏXŽž‚É•\Ž¦‚ª—‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
114+
113115
114116 Ver 1.96dˆÈ‘O‚Ö–ß‚·ê‡
115117 -----------------------
--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -82,6 +82,8 @@ FFFTP
8282
8383 EFireWallƒ†[ƒU[–¼‚¨‚æ‚уpƒXƒ[ƒh‚ð•Û‘¶‚µ‚È‚¢Ý’è‚ð’ljÁ‚µ‚Ü‚µ‚½B
8484
85+Eƒ_ƒCƒAƒƒO‚̃TƒCƒY•ÏXŽž‚É•\Ž¦‚ª—‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
86+
8587 ¡Ver 1.98g2
8688
8789 EƒCƒ“ƒXƒg[ƒ‰”Å‚ÉZIP”ł̃tƒ@ƒCƒ‹‚ª¬“ü‚µ‚Ä‚¢‚½–â‘è‚ðC³‚µ‚Ü‚µ‚½B
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -1862,7 +1862,9 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
18621862 {
18631863 static DIALOGSIZE DlgSize = {
18641864 { MIRROR_DEL, MIRROR_SIZEGRIP, -1 },
1865- { IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, -1 },
1865+ // ミラーリング設定追加
1866+// { IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, -1 },
1867+ { IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, MIRROR_NO_TRANSFER, -1 },
18661868 { MIRROR_LIST, -1 },
18671869 { 0, 0 },
18681870 { 0, 0 }
@@ -1873,9 +1875,18 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
18731875 char Tmp[FMAX_PATH+1+6];
18741876 int Num;
18751877 int *List;
1878+ // バグ修正
1879+ RECT Rect;
18761880
18771881 switch (iMessage)
18781882 {
1883+ // バグ修正
1884+ case WM_SIZE :
1885+ GetWindowRect(hDlg, &Rect);
1886+ DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
1887+ RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);
1888+ break;
1889+
18791890 case WM_INITDIALOG :
18801891 Base = (TRANSPACKET **)lParam;
18811892 Pos = *Base;
--- a/hostman.c
+++ b/hostman.c
@@ -173,9 +173,18 @@ static INT_PTR CALLBACK SelectHostProc(HWND hDlg, UINT message, WPARAM wParam, L
173173 NM_TREEVIEWW *tView;
174174 HTREEITEM tViewPos;
175175 TV_HITTESTINFO HitInfo;
176+ // バグ修正
177+ RECT Rect;
176178
177179 switch (message)
178180 {
181+ // バグ修正
182+ case WM_SIZE :
183+ GetWindowRect(hDlg, &Rect);
184+ DlgSizeChange(hDlg, &DlgSize, &Rect, 0);
185+ RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);
186+ break;
187+
179188 case WM_INITDIALOG :
180189 /* TreeViewでのダブルクリックをつかまえるため */
181190 // 64ビット対応