[Ttssh2-commit] [8373] メニューバー非表示設定時にDPIが変化したとき、ウィンドウサイズを正しく調整するよう修正

scmno****@osdn***** scmno****@osdn*****
2019年 11月 16日 (土) 02:02:21 JST


Revision: 8373
          https://osdn.net/projects/ttssh2/scm/svn/commits/8373
Author:   zmatsuo
Date:     2019-11-16 02:02:20 +0900 (Sat, 16 Nov 2019)
Log Message:
-----------
メニューバー非表示設定時にDPIが変化したとき、ウィンドウサイズを正しく調整するよう修正

- DPIの異なるディスプレイをまたいだときなど

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-11-14 14:22:35 UTC (rev 8372)
+++ trunk/doc/en/html/about/history.html	2019-11-15 17:02:20 UTC (rev 8373)
@@ -73,6 +73,7 @@
       <li>The help button on the printer dialog can not be shown from Windows 2000 to 10(except Windows95).</li>
       <li>Don't close MACRO window when ESC key is pressed. This bug was introduced in 4.103.</li>
       <li>Tera Term is not terminate when TEK window is closed. This bug was introduced in 4.103.</li>
+      <!--li>\x83\x81\x83j\x83\x85\x81[\x83o\x81[\x94\xF1\x95\\x8E\xA6\x8E\x9E\x81ADPI\x82\xAA\x95ω\xBB\x82\xB5\x82\xBD\x82Ƃ\xAB\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82𐳂\xB5\x82\xAD\x92\xB2\x90\xAE\x82\xB7\x82\xE9\x82悤\x8FC\x90\xB3</li-->
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-11-14 14:22:35 UTC (rev 8372)
+++ trunk/doc/ja/html/about/history.html	2019-11-15 17:02:20 UTC (rev 8373)
@@ -73,6 +73,7 @@
       <li>Windows2000\x81`10\x82ŁA\x88\xF3\x8D\xFC\x83_\x83C\x83A\x83\x8D\x83O\x82Ƀw\x83\x8B\x83v\x83{\x83^\x83\x93\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD(Windows95\x82͏\x9C\x82\xAD)\x81B</li>
       <li>MACRO \x83E\x83B\x83\x93\x83h\x83E\x82ŁAESC\x83L\x81[\x82\xF0\x89\x9F\x89\xBA\x8E\x9E\x8FI\x97\xB9\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
       <li>TEK\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x95‚\xB6\x82\xBD\x82Ƃ\xAB Tera Term \x8E\xA9\x90g\x82͏I\x97\xB9\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
+      <li>\x83\x81\x83j\x83\x85\x81[\x83o\x81[\x94\xF1\x95\\x8E\xA6\x8E\x9E\x81A\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82𐳂\xB5\x82\xAD\x92\xB2\x90\xAE\x82\xB7\x82\xE9\x82悤\x8FC\x90\xB3</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2019-11-14 14:22:35 UTC (rev 8372)
+++ trunk/teraterm/teraterm/vtwin.cpp	2019-11-15 17:02:20 UTC (rev 8373)
@@ -6230,8 +6230,9 @@
 	// \x83X\x83N\x83\x8A\x81[\x83\x93\x83T\x83C\x83Y(=Client Area\x82̃T\x83C\x83Y)\x82\xA9\x82\xE7\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8EZ\x8Fo
 	const LONG_PTR Style = ::GetWindowLongPtr(m_hWnd, GWL_STYLE);
 	const LONG_PTR ExStyle = ::GetWindowLongPtr(m_hWnd, GWL_EXSTYLE);
+	const BOOL bMenu = (ts.PopupMenu != 0) ? FALSE : TRUE;
 	RECT Rect = {0, 0, ScreenWidth, ScreenHeight};
-	pAdjustWindowRectExForDpi(&Rect, Style, TRUE/*menu*/, ExStyle, NewDPI);
+	pAdjustWindowRectExForDpi(&Rect, Style, bMenu, ExStyle, NewDPI);
 	const int NewWindowWidth = Rect.right - Rect.left;
 	const int NewWindowHeight = Rect.bottom - Rect.top;
 


Ttssh2-commit メーリングリストの案内