Fix bugs of dialog resizing.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 1e7fbc2..169980b 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
--- a/bookmark.c
+++ b/bookmark.c
@@ -402,6 +402,8 @@ static INT_PTR CALLBACK EditBookMarkProc(HWND hDlg, UINT message, WPARAM wParam,
        int Cur;\r
        int Max;\r
        char Tmp[BMARK_MARK_LEN + FMAX_PATH * 2 + BMARK_SEP_LEN + 1];\r
+       // バグ修正\r
+       RECT Rect;\r
 \r
        static DIALOGSIZE DlgSize = {\r
                { BMARK_NEW, BMARK_SET, BMARK_DEL, BMARK_DOWN, BMARK_UP, IDHELP, BMARK_SIZEGRIP, -1 },\r
@@ -413,6 +415,13 @@ static INT_PTR CALLBACK EditBookMarkProc(HWND hDlg, UINT message, WPARAM wParam,
 \r
        switch (message)\r
        {\r
+               // バグ修正\r
+               case WM_SIZE :\r
+                       GetWindowRect(hDlg, &Rect);\r
+                       DlgSizeChange(hDlg, &DlgSize, &Rect, 0);\r
+                       RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);\r
+                   break;\r
+\r
                case WM_INITDIALOG :\r
                        if(ListFont != NULL)\r
                                SendDlgItemMessage(hDlg, BMARK_LIST, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));\r

diff --git a/common.h b/common.h
index d9519f4..c985295 100644 (file)
--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新\r
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする\r
 // 2014年7月31日中の30個目のリリースは2014073129\r
-#define RELEASE_VERSION_NUM            2016030500      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2016031300      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/doc/eng/FFFTP.txt b/doc/eng/FFFTP.txt
index 9e4430a..6d9c01a 100644 (file)
--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -106,6 +106,8 @@ Changes in Ver.1.99
 \r
 -- Added an option not to save the user name and password of the firewall.\r
 \r
+-- Fixed bugs to disturb the view after resizing of a dialog.\r
+\r
 \r
 Outline\r
 -------\r

diff --git a/doc/eng/history.txt b/doc/eng/history.txt
index 0b359ae..62fbadd 100644 (file)
--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -78,6 +78,8 @@ Changes in Ver.1.99
 \r
 -- Added an option not to save the user name and password of the firewall.\r
 \r
+-- Fixed bugs to disturb the view after resizing of a dialog.\r
+\r
 Changes in Ver.1.98g2\r
 --------------------\r
 \r

diff --git a/doc/jpn/FFFTP.txt b/doc/jpn/FFFTP.txt
index 3fdf5fa..96bf977 100644 (file)
--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -110,6 +110,8 @@ Ver 1.99
 \r
 \81EFireWall\83\86\81[\83U\81[\96¼\82¨\82æ\82Ñ\83p\83X\83\8f\81[\83h\82ð\95Û\91¶\82µ\82È\82¢\90Ý\92è\82ð\92Ç\89Á\82µ\82Ü\82µ\82½\81B\r
 \r
+\81E\83_\83C\83A\83\8d\83O\82Ì\83T\83C\83Y\95Ï\8dX\8e\9e\82É\95\\8e¦\82ª\97\90\82ê\82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\r
+\r
 \r
 Ver 1.96d\88È\91O\82Ö\96ß\82·\8fê\8d\87\r
 -----------------------\r

diff --git a/doc/jpn/history.txt b/doc/jpn/history.txt
index 006ad30..2ffcde4 100644 (file)
--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -82,6 +82,8 @@ FFFTP
 \r
 \81EFireWall\83\86\81[\83U\81[\96¼\82¨\82æ\82Ñ\83p\83X\83\8f\81[\83h\82ð\95Û\91¶\82µ\82È\82¢\90Ý\92è\82ð\92Ç\89Á\82µ\82Ü\82µ\82½\81B\r
 \r
+\81E\83_\83C\83A\83\8d\83O\82Ì\83T\83C\83Y\95Ï\8dX\8e\9e\82É\95\\8e¦\82ª\97\90\82ê\82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\r
+\r
 \81¡Ver 1.98g2\r
 \r
 \81E\83C\83\93\83X\83g\81[\83\89\94Å\82ÉZIP\94Å\82Ì\83t\83@\83C\83\8b\82ª\8d¬\93ü\82µ\82Ä\82¢\82½\96â\91è\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\r

diff --git a/ftpproc.c b/ftpproc.c
index 13e5d2b..800bac1 100644 (file)
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -1862,7 +1862,9 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
 {\r
        static DIALOGSIZE DlgSize = {\r
                { MIRROR_DEL, MIRROR_SIZEGRIP, -1 },\r
-               { IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, -1 },\r
+               // ミラーリング設定追加\r
+//             { IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, -1 },\r
+               { IDOK, IDCANCEL, IDHELP, MIRROR_DEL, MIRROR_COPYNUM, MIRROR_MAKENUM, MIRROR_DELNUM, MIRROR_SIZEGRIP, MIRROR_NO_TRANSFER, -1 },\r
                { MIRROR_LIST, -1 },\r
                { 0, 0 },\r
                { 0, 0 }\r
@@ -1873,9 +1875,18 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
        char Tmp[FMAX_PATH+1+6];\r
        int Num;\r
        int *List;\r
+       // バグ修正\r
+       RECT Rect;\r
 \r
        switch (iMessage)\r
        {\r
+               // バグ修正\r
+               case WM_SIZE :\r
+                       GetWindowRect(hDlg, &Rect);\r
+                       DlgSizeChange(hDlg, &DlgSize, &Rect, 0);\r
+                       RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);\r
+                   break;\r
+\r
                case WM_INITDIALOG :\r
                        Base = (TRANSPACKET **)lParam;\r
                        Pos = *Base;\r

diff --git a/hostman.c b/hostman.c
index a892ec5..e07dee7 100644 (file)
--- 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;\r
        HTREEITEM tViewPos;\r
        TV_HITTESTINFO HitInfo;\r
+       // バグ修正\r
+       RECT Rect;\r
 \r
        switch (message)\r
        {\r
+               // バグ修正\r
+               case WM_SIZE :\r
+                       GetWindowRect(hDlg, &Rect);\r
+                       DlgSizeChange(hDlg, &DlgSize, &Rect, 0);\r
+                       RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN);\r
+                   break;\r
+\r
                case WM_INITDIALOG :\r
                        /* TreeViewでのダブルクリックをつかまえるため */\r
                        // 64ビット対応\r