From 32126a723affce5ff643a3eb8fbee23646248d4f Mon Sep 17 00:00:00 2001 From: Nomango Date: Sun, 1 Apr 2018 13:28:32 +0800 Subject: [PATCH] fixed revert --- core/Node/Text.cpp | 5 +++-- core/emacros.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/Node/Text.cpp b/core/Node/Text.cpp index d73f0129..98c007f8 100644 --- a/core/Node/Text.cpp +++ b/core/Node/Text.cpp @@ -327,12 +327,13 @@ void e2d::Text::_createLayout() ASSERT(SUCCEEDED(hr), "Create IDWriteTextFormat Failed!"); // 添加下划线和删除线 + DWRITE_TEXT_RANGE range = { 0, length }; if (m_Font.underline) { - m_pDWriteTextLayout->SetUnderline(true, { 0, length }); + m_pDWriteTextLayout->SetUnderline(true, range); } if (m_Font.strikethrough) { - m_pDWriteTextLayout->SetStrikethrough(true, { 0, length }); + m_pDWriteTextLayout->SetStrikethrough(true, range); } } diff --git a/core/emacros.h b/core/emacros.h index 0a150c7f..0a18e361 100644 --- a/core/emacros.h +++ b/core/emacros.h @@ -73,7 +73,7 @@ EXTERN_C IMAGE_DOS_HEADER __ImageBase; #endif -#if _MSC_VER <= 1700 +#if _MSC_VER > 1700 #define HIGHER_THAN_VS2012 1 #else #define HIGHER_THAN_VS2012 0