From c999d0bb4de0e9424a432461eabebd62ba6dad56 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 31 Jul 2020 23:35:54 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A9=BA=E8=A1=8C=E6=8F=8F=E7=94=BB?= =?UTF-8?q?=E3=81=AE=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=8C?= =?UTF-8?q?=E8=AA=A4=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/window/CTipWnd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/window/CTipWnd.cpp b/sakura_core/window/CTipWnd.cpp index 91b5e30159..f173396ba3 100644 --- a/sakura_core/window/CTipWnd.cpp +++ b/sakura_core/window/CTipWnd.cpp @@ -257,7 +257,7 @@ void CTipWnd::DrawTipText( ); }else{ // ダミー文字列の高さを取得する - nHeight = ::DrawText( hdc, szDummy, _countof(szDummy) - 1, &rc, DT_CALCRECT ); + nHeight = ::DrawText( hdc, szDummy, _countof(szDummy) - 1, &rc, DT_EXTERNALLEADING ); } // 描画領域の上端を1行分ずらす From 4981d6fdbb16c51a8383fe76087c2a2021f1fe1f Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 2 Aug 2020 14:12:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A9=BA=E8=A1=8C=E3=81=AE=E9=AB=98?= =?UTF-8?q?=E3=81=95=E3=82=92=E8=A8=88=E6=B8=AC=E3=81=99=E3=82=8BDrawText?= =?UTF-8?q?=E3=81=AE=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=8C?= =?UTF-8?q?=E8=B6=B3=E3=82=8A=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit レビュー指摘対応。 --- sakura_core/window/CTipWnd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/window/CTipWnd.cpp b/sakura_core/window/CTipWnd.cpp index f173396ba3..4281ead03a 100644 --- a/sakura_core/window/CTipWnd.cpp +++ b/sakura_core/window/CTipWnd.cpp @@ -185,7 +185,7 @@ void CTipWnd::ComputeWindowSize( } }else{ // ダミー文字列を計測して必要な高さを取得する - ::DrawText( hdc, szDummy, _countof( szDummy ) - 1, &rc, DT_CALCRECT ); + ::DrawText( hdc, szDummy, _countof( szDummy ) - 1, &rc, DT_CALCRECT | DT_EXTERNALLEADING ); } // 計測した高さを加算する