Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed revert

This commit is contained in:
Nomango 2018-04-01 13:28:32 +08:00
parent b318b84860
commit 32126a723a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Node/Text.cpp
View File

@ -327,12 +327,13 @@ void e2d::Text::_createLayout()
ASSERT(SUCCEEDED(hr), "Create IDWriteTextFormat Failed!"); ASSERT(SUCCEEDED(hr), "Create IDWriteTextFormat Failed!");
// 添加下划线和删除线 // 添加下划线和删除线
DWRITE_TEXT_RANGE range = { 0, length };
if (m_Font.underline) if (m_Font.underline)
{ {
m_pDWriteTextLayout->SetUnderline(true, { 0, length }); m_pDWriteTextLayout->SetUnderline(true, range);
} }
if (m_Font.strikethrough) if (m_Font.strikethrough)
{ {
m_pDWriteTextLayout->SetStrikethrough(true, { 0, length }); m_pDWriteTextLayout->SetStrikethrough(true, range);
} }
} }

2
core/emacros.h
View File

@ -73,7 +73,7 @@ EXTERN_C IMAGE_DOS_HEADER __ImageBase;
#endif #endif
#if _MSC_VER <= 1700 #if _MSC_VER > 1700
#define HIGHER_THAN_VS2012 1 #define HIGHER_THAN_VS2012 1
#else #else
#define HIGHER_THAN_VS2012 0 #define HIGHER_THAN_VS2012 0