Tera TermRevision: 8166
https://osdn.net/projects/ttssh2/scm/svn/commits/8166
Author: yasuhide
Date: 2019-09-16 00:33:26 +0900 (Mon, 16 Sep 2019)
Log Message:
-----------
FRAME_WIDTHをTIP_WIN_FRAME_WIDTHに変更した
Modified Paths:
--------------
branches/tootip_classify/teraterm/common/tipwin.cpp
branches/tootip_classify/teraterm/common/tipwin.h
branches/tootip_classify/teraterm/teraterm/sizetip.c
-------------- next part --------------
Modified: branches/tootip_classify/teraterm/common/tipwin.cpp
===================================================================
--- branches/tootip_classify/teraterm/common/tipwin.cpp 2019-09-15 15:33:25 UTC (rev 8165)
+++ branches/tootip_classify/teraterm/common/tipwin.cpp 2019-09-15 15:33:26 UTC (rev 8166)
@@ -137,10 +137,10 @@
{
RECT rect = self->tWin->str_rect;
- rect.left = rect.left + FRAME_WIDTH;
- rect.right = rect.right + FRAME_WIDTH;
- rect.top = rect.top + FRAME_WIDTH;
- rect.bottom = rect.bottom + FRAME_WIDTH;
+ rect.left = rect.left + TIP_WIN_FRAME_WIDTH;
+ rect.right = rect.right + TIP_WIN_FRAME_WIDTH;
+ rect.top = rect.top + TIP_WIN_FRAME_WIDTH;
+ rect.bottom = rect.bottom + TIP_WIN_FRAME_WIDTH;
DrawText(hdc, self->tWin->str, self->tWin->str_len, &rect, DT_LEFT);
}
@@ -166,7 +166,7 @@
SetWindowPos(hWnd, NULL,
0, 0,
- str_width + FRAME_WIDTH * 2, str_height + FRAME_WIDTH * 2,
+ str_width + TIP_WIN_FRAME_WIDTH * 2, str_height + TIP_WIN_FRAME_WIDTH * 2,
SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE);
InvalidateRect(hWnd, NULL, FALSE);
@@ -261,7 +261,7 @@
MAKEINTRESOURCE(tip_class),
str, WS_POPUP,
cx, cy,
- str_width + FRAME_WIDTH * 2, str_height + FRAME_WIDTH * 2,
+ str_width + TIP_WIN_FRAME_WIDTH * 2, str_height + TIP_WIN_FRAME_WIDTH * 2,
src, NULL, hInst, this);
/*
@@ -438,4 +438,4 @@
{
CTipWin* tipwin = (CTipWin*) tWin;
return (int)tipwin->IsVisible();
-}
+}
\ No newline at end of file
Modified: branches/tootip_classify/teraterm/common/tipwin.h
===================================================================
--- branches/tootip_classify/teraterm/common/tipwin.h 2019-09-15 15:33:25 UTC (rev 8165)
+++ branches/tootip_classify/teraterm/common/tipwin.h 2019-09-15 15:33:26 UTC (rev 8166)
@@ -35,7 +35,7 @@
extern "C" {
#endif
-#define FRAME_WIDTH 6
+#define TIP_WIN_FRAME_WIDTH 6
typedef struct tagTipWinData TipWin;
Modified: branches/tootip_classify/teraterm/teraterm/sizetip.c
===================================================================
--- branches/tootip_classify/teraterm/teraterm/sizetip.c 2019-09-15 15:33:25 UTC (rev 8165)
+++ branches/tootip_classify/teraterm/teraterm/sizetip.c 2019-09-15 15:33:26 UTC (rev 8166)
@@ -135,9 +135,9 @@
GetWindowRect(src, &wr);
// sizetip\x82\xF0\x8Fo\x82\xB7\x88ʒu\x82́A\x83E\x83B\x83\x93\x83h\x83E\x8D\xB6\x8F\xE3(X, Y)\x82ɑ\xB5\x82āA
- // (X, Y - \x95\xB6\x8E\x9A\x97\xF1\x82̍\x82\x82\xB3 - FRAME_WIDTH * 2) \x82Ƃ\xB7\x82\xE9\x81B
+ // (X, Y - \x95\xB6\x8E\x9A\x97\xF1\x82̍\x82\x82\xB3 - TIP_WIN_FRAME_WIDTH * 2) \x82Ƃ\xB7\x82\xE9\x81B
point.x = wr.left;
- point.y = wr.top - (h + FRAME_WIDTH * 2);
+ point.y = wr.top - (h + TIP_WIN_FRAME_WIDTH * 2);
FixPosFromFrame(&point, 16, FALSE);
cx = point.x;
cy = point.y;
@@ -155,7 +155,7 @@
// \x83E\x83B\x83\x93\x83h\x83E\x82̍\xB6\x8Fオ\x88ړ\xAE\x82\xB7\x82\xE9\x8Fꍇ
if (tooltip_movable) {
- TipWinSetPos(SizeTip, newX + FRAME_WIDTH*2, newY + FRAME_WIDTH*2);
+ TipWinSetPos(SizeTip, newX + TIP_WIN_FRAME_WIDTH*2, newY + TIP_WIN_FRAME_WIDTH*2);
//OutputDebugPrintf("Moved: (%d,%d)\n", newX, newY);
}
}