[Ttssh2-commit] [7132] TermIsWin が on の時はタイトルバーのダブルクリックで最大化する #38074

scmno****@osdn***** scmno****@osdn*****
2018年 6月 14日 (木) 17:43:47 JST


Revision: 7132
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7132
Author:   doda
Date:     2018-06-14 17:43:47 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
TermIsWin が on の時はタイトルバーのダブルクリックで最大化する #38074

タイトルバーのダブルクリックするとウィンドウサイズを端末に合わせるが、
TermIsWin が on の時はこの動作の意味が無いので、一般的なアプリと同じ
ようにウィンドウの最大化を行うようにする。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/38074

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

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/doc/en/html/about/history.html	2018-06-14 08:43:47 UTC (rev 7132)
@@ -36,6 +36,7 @@
   <li>Changes
     <ul>
       <li>added the <a href="../setup/teraterm-win.html#title">Title format configuration</a> on the General tab of the <a href="../menu/setup-additional.html#TitleFormat">Additional settings dialog</a>.</li>
+      <li>Window size is maximized when the titlie bar is double-clicked if <a href="../menu/setup-terminal.html#TermIsWin">"Term size = win size"</a> setting is on.</li>
     </ul>
   </li>
 

Modified: trunk/doc/en/html/usage/mouse.html
===================================================================
--- trunk/doc/en/html/usage/mouse.html	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/doc/en/html/usage/mouse.html	2018-06-14 08:43:47 UTC (rev 7132)
@@ -40,8 +40,16 @@
     It is effective when <a href="../menu/setup-additional.html">DisableMouseRButtonPaste</a> is disabled.</dd>
 
 <dt>Double clicking the left button on the title bar</dt>
-<dd>If the window size (real screen size) is not equal to the terminal size (logical size of the terminal), resizes the window to the terminal size. A further double clicking restores the original window size.</dd>
+<dd>
+  <dl>The behaviour is changed according to the <a href="../menu/setup-terminal.html#TermIsWin">"Term size = win size"</a> setting.
+    <dt>On</dt>
+    <dd>Maximize window. If the window is already maximized, restore to the original size.</dd>
 
+    <dt>Off</dt>
+    <dd>If the window size (real screen size) is not equal to the terminal size (logical size of the terminal), resizes the window to the terminal size. A further double clicking restores the original window size.</dd>
+  </dl>
+</dd>
+
 <dt>Clicking the left button while pressing the Ctrl key</dt>
 <dd>If the menu bar is hidden, the pop-up menu appears. To hide the menu bar, check the Hide menu bar option in the [Setup] Window dialog box.</dd>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/doc/ja/html/about/history.html	2018-06-14 08:43:47 UTC (rev 7132)
@@ -36,6 +36,7 @@
   <li>\x95ύX
     <ul>
       <li><a href="../menu/setup-additional.html#TitleFormat">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC General \x83^\x83u\x82\xC9<a href="../setup/teraterm-win.html#title">\x83^\x83C\x83g\x83\x8B\x8C`\x8E\xAE\x82̐ݒ\xE8</a>\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
+      <li><a href="../menu/setup-terminal.html#TermIsWin">Term size = win size</a> \x90ݒ肪 on \x82̏ꍇ\x82́A\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB5\x82\xBD\x8E\x9E\x82ɃE\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8Dő剻\x82\xB7\x82\xE9\x82悤\x82ɕύX\x82\xB5\x82\xBD\x81B</a>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/usage/mouse.html
===================================================================
--- trunk/doc/ja/html/usage/mouse.html	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/doc/ja/html/usage/mouse.html	2018-06-14 08:43:47 UTC (rev 7132)
@@ -40,8 +40,16 @@
     <a href="../menu/setup-additional.html">DisableMouseRButtonPaste</a> \x82\xAA\x96\xB3\x8C\xF8\x82̂Ƃ\xAB\x82ɓ\xAE\x8D삷\x82\xE9\x81B</dd>
 
 <dt>\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82̏\xE3\x82ō\xB6\x83{\x83^\x83\x93\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N</dt>
-<dd>\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83E\x83C\x83\x93\x83h\x83E\x82̎\xC0\x8Dۂ̑傫\x82\xB3)\x82\xAA\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x82̘_\x97\x9D\x93I\x82ȉ\xE6\x96ʂ̑傫\x82\xB3)\x82ƈقȂ\xE9\x82Ƃ\xAB\x81A\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82Ɠ\xAF\x82\xB6\x82ɂȂ\xE9\x82悤\x82ɕύX\x82\xB5\x82܂\xB7\x81B\x82\xBB\x82̌\xE3\x81A\x82\xE0\x82\xA4\x88\xEA\x93x\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB7\x82\xE9\x82ƁA\x82\xE0\x82Ƃ̃E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82ɖ߂\xE8\x82܂\xB7\x81B</dd>
+<dd><a href="../menu/setup-terminal.html#TermIsWin">Term size = win size</a>\x82̐ݒ\xE8\x82ɂ\xE6\x82\xC1\x82ē\xAE\x8D삪\x95ς\xED\x82\xE8\x82܂\xB7\x81B
+  <dl>
+    <dt>on\x82̎\x9E</dt>
+    <dd>\x83E\x83B\x83\x93\x83h\x83E\x82̃T\x83C\x83Y\x82\xF0\x8Dő剻\x82\xB5\x82܂\xB7\x81B\x8A\xF9\x82ɍő剻\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8Fꍇ\x82́A\x82\xE0\x82Ƃ̃T\x83C\x83Y\x82ɖ߂\xB5\x82܂\xB7\x81B</dd>
 
+    <dt>off\x82̎\x9E</dt>
+    <dd>\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83E\x83C\x83\x93\x83h\x83E\x82̎\xC0\x8Dۂ̑傫\x82\xB3)\x82\xAA\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x82̘_\x97\x9D\x93I\x82ȉ\xE6\x96ʂ̑傫\x82\xB3)\x82ƈقȂ\xE9\x82Ƃ\xAB\x81A\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82Ɠ\xAF\x82\xB6\x82ɂȂ\xE9\x82悤\x82ɕύX\x82\xB5\x82܂\xB7\x81B\x82\xBB\x82̌\xE3\x81A\x82\xE0\x82\xA4\x88\xEA\x93x\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB7\x82\xE9\x82ƁA\x82\xE0\x82Ƃ̃E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82ɖ߂\xE8\x82܂\xB7\x81B</dd>
+  </dl>
+</dd>
+
 <dt>Ctrl \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82Ȃ\xAA\x82獶\x83{\x83^\x83\x93\x82\xF0\x83N\x83\x8A\x83b\x83N</dt>
 <dd>\x83\x81\x83j\x83\x85\x81[\x83o\x81[\x82\xAA\x82Ȃ\xAF\x82\xEA\x82΁A\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[\x82\xAA\x8C\xBB\x82\xEA\x82܂\xB7\x81B\x83\x81\x83j\x83\x85\x81[\x83o\x81[\x82\xF0\x89B\x82\xB7\x82ɂ́A<A HREF="../menu/setup-window.html">[Setup] Window</A> \x82\xC5 Hide menu bar \x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B</dd>
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/teraterm/teraterm/vtwin.cpp	2018-06-14 08:43:47 UTC (rev 7132)
@@ -2513,7 +2513,7 @@
 
 void CVTWindow::OnNcLButtonDblClk(UINT nHitTest, CPoint point)
 {
-	if (! Minimized && (nHitTest == HTCAPTION)) {
+	if (! Minimized && !ts.TermIsWin && (nHitTest == HTCAPTION)) {
 		DispRestoreWinSize();
 	}
 	else {



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