Tera TermRevision: 8067
https://osdn.net/projects/ttssh2/scm/svn/commits/8067
Author: yutakapon
Date: 2019-09-06 20:31:51 +0900 (Fri, 06 Sep 2019)
Log Message:
-----------
r8066 の修正でSSH認証のパスワードダイアログにおけるツールチップの表示位置を調整した。
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8066
Modified Paths:
--------------
trunk/teraterm/common/tipwin.cpp
trunk/teraterm/common/tipwin.h
trunk/teraterm/teraterm/sizetip.c
trunk/ttssh2/ttxssh/auth.c
-------------- next part --------------
Modified: trunk/teraterm/common/tipwin.cpp
===================================================================
--- trunk/teraterm/common/tipwin.cpp 2019-09-06 11:06:40 UTC (rev 8066)
+++ trunk/teraterm/common/tipwin.cpp 2019-09-06 11:31:51 UTC (rev 8067)
@@ -282,7 +282,7 @@
assert(pTipWin->tip_wnd != NULL);
}
-TipWin *TipWinCreate(HWND src, int cx, int cy, const TCHAR *str)
+TipWin *TipWinCreate(HWND src, int cx, int cy, const TCHAR *str, BOOL resizing_tips)
{
TipWin *pTipWin;
const HINSTANCE hInst = (HINSTANCE)GetWindowLongPtr(src, GWLP_HINSTANCE);
@@ -307,13 +307,15 @@
CalcStrRect(pTipWin);
pTipWin->hParentWnd = src;
- // \x95\xB6\x8E\x9A\x97\xF1\x82̍\x82\x82\xB3\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
- height = pTipWin->str_rect.bottom - pTipWin->str_rect.top;
- point.x = cx;
- point.y = cy - (height + FRAME_WIDTH * 2);
- FixPosFromFrame(&point, 16, FALSE);
- cx = point.x;
- cy = point.y;
+ // \x95\xB6\x8E\x9A\x97\xF1\x82̍\x82\x82\xB3\x82\xA9\x82\xE7\x95\\x8E\xA6\x88ʒu\x82\xAE\x82\xB7\x82\xE9\x81B
+ if (resizing_tips) {
+ height = pTipWin->str_rect.bottom - pTipWin->str_rect.top;
+ point.x = cx;
+ point.y = cy - (height + FRAME_WIDTH * 2);
+ FixPosFromFrame(&point, 16, FALSE);
+ cx = point.x;
+ cy = point.y;
+ }
create_tipwin(pTipWin, hInst, cx, cy);
Modified: trunk/teraterm/common/tipwin.h
===================================================================
--- trunk/teraterm/common/tipwin.h 2019-09-06 11:06:40 UTC (rev 8066)
+++ trunk/teraterm/common/tipwin.h 2019-09-06 11:31:51 UTC (rev 8067)
@@ -8,7 +8,7 @@
typedef struct tagTipWinData TipWin;
-TipWin *TipWinCreate(HWND src, int cx, int cy, const TCHAR *str);
+TipWin *TipWinCreate(HWND src, int cx, int cy, const TCHAR *str, BOOL resizing_tips);
void TipWinSetText(TipWin *tWin, TCHAR *text);
void TipWinDestroy(TipWin *tWin);
Modified: trunk/teraterm/teraterm/sizetip.c
===================================================================
--- trunk/teraterm/teraterm/sizetip.c 2019-09-06 11:06:40 UTC (rev 8066)
+++ trunk/teraterm/teraterm/sizetip.c 2019-09-06 11:31:51 UTC (rev 8067)
@@ -58,7 +58,7 @@
GetWindowRect(src, &wr);
cx = wr.left;
cy = wr.top;
- SizeTip = TipWinCreate(src, cx, cy, str);
+ SizeTip = TipWinCreate(src, cx, cy, str, TRUE);
} else {
/* Tip already exists, just set the text */
TipWinSetText(SizeTip, str);
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c 2019-09-06 11:06:40 UTC (rev 8066)
+++ trunk/ttssh2/ttxssh/auth.c 2019-09-06 11:31:51 UTC (rev 8067)
@@ -121,7 +121,7 @@
_tcscat_s(uimsg, _countof(uimsg), pvar->ts->UIMsg);
}
GetWindowRect(control, &rect);
- data->tipwin = TipWinCreate(control, rect.left, rect.bottom, uimsg);
+ data->tipwin = TipWinCreate(control, rect.left, rect.bottom, uimsg, FALSE);
}
return 0;