Tera TermRevision: 8115
https://osdn.net/projects/ttssh2/scm/svn/commits/8115
Author: yasuhide
Date: 2019-09-12 00:19:26 +0900 (Thu, 12 Sep 2019)
Log Message:
-----------
不透明度ツールチップのDestroyを関数化した
Modified Paths:
--------------
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2019-09-11 14:29:57 UTC (rev 8114)
+++ trunk/teraterm/teraterm/vtwin.cpp 2019-09-11 15:19:26 UTC (rev 8115)
@@ -142,8 +142,7 @@
static int AutoDisconnectedPort = -1;
static TipWin *OpacityTip;
-static int OpacityTipPtsX = 0;
-static int OpacityTipPtsY = 0;
+static POINT OpacityTipPts;
#ifndef WM_IME_COMPOSITION
#define WM_IME_COMPOSITION 0x010F
@@ -177,10 +176,10 @@
}
}
-static void DestroyOpacityTip(void) {
- if (OpacityTip) {
- TipWinDestroy(OpacityTip);
- OpacityTip = NULL;
+static void DestroyTooltip(TipWin* *tooltip) {
+ if (*tooltip) {
+ TipWinDestroy(*tooltip);
+ (*tooltip) = NULL;
}
}
@@ -2458,21 +2457,23 @@
newAlpha = 0;
SetWindowAlpha(newAlpha);
- get_lang_msg("TOOLTIP_TITLEBAR_OPACITY", uimsg, sizeof(uimsg), "Opacity %.0f %%", ts.UILanguageFile);
+ get_lang_msg("TOOLTIP_TITLEBAR_OPACITY", uimsg, sizeof(uimsg), "Opacity %.1f %%", ts.UILanguageFile);
_stprintf_s(tipbuf, _countof(tipbuf), _T(uimsg), (newAlpha / 255.0) * 100);
::SetTimer(HVTWin, IdOpacityTipTimer, 1000, NULL);
- if (OpacityTipPtsX != pt.x ||
- OpacityTipPtsY != pt.y) {
- DestroyOpacityTip();
+ if (OpacityTipPts.x != pt.x ||
+ OpacityTipPts.y != pt.y) {
+ DestroyTooltip(&OpacityTip);
}
if (OpacityTip == NULL) {
OpacityTip = TipWinCreate(HVTWin, pt.x, pt.y, tipbuf);
- OpacityTipPtsX = pt.x;
- OpacityTipPtsY = pt.y;
+ OpacityTipPts.x = pt.x;
+ OpacityTipPts.y = pt.y;
} else {
TipWinSetText(OpacityTip, tipbuf);
+ // \x83c\x81[\x83\x8B\x83`\x83b\x83v\x82̃\x8A\x83T\x83C\x83Y\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x82悤\x82Ɍ\xA9\x82\xA6\x82\xE9\x96\xE2\x91\xE8\x82̎b\x92\xE8\x91\xF4
+ TipWinSetText(OpacityTip, tipbuf);
}
return TRUE;
@@ -2937,7 +2938,7 @@
PrnFileDirectProc();
break;
case IdOpacityTipTimer:
- DestroyOpacityTip();
+ DestroyTooltip(&OpacityTip);
break;
}
}