mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Reverted 6e9bc98
due to bug in GDI+ and newline
http://rainmeter.net/forum/viewtopic.php?p=89915#p89915
This commit is contained in:
parent
ed9ea73e6b
commit
f76634055d
@ -181,7 +181,7 @@ bool CanvasGDIP::MeasureTextLinesW(const WCHAR* str, UINT strLen, const TextForm
|
||||
stringFormat.SetTrimming(Gdiplus::StringTrimmingNone);
|
||||
|
||||
const INT stringFormatFlags = stringFormat.GetFormatFlags();
|
||||
stringFormat.SetFormatFlags(Gdiplus::StringFormatFlagsMeasureTrailingSpaces | Gdiplus::StringFormatFlagsNoClip);
|
||||
stringFormat.SetFormatFlags(Gdiplus::StringFormatFlagsNoClip);
|
||||
|
||||
INT linesFilled = 0;
|
||||
const Gdiplus::Status status = m_Graphics->MeasureString(
|
||||
|
@ -101,13 +101,12 @@ void TextFormatGDIP::SetTrimming(bool trim)
|
||||
if (trim)
|
||||
{
|
||||
m_StringFormat.SetTrimming(Gdiplus::StringTrimmingEllipsisCharacter);
|
||||
m_StringFormat.SetFormatFlags(Gdiplus::StringFormatFlagsMeasureTrailingSpaces);
|
||||
m_StringFormat.SetFormatFlags(0x0);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_StringFormat.SetTrimming(Gdiplus::StringTrimmingNone);
|
||||
m_StringFormat.SetFormatFlags(Gdiplus::StringFormatFlagsMeasureTrailingSpaces |
|
||||
Gdiplus::StringFormatFlagsNoClip | Gdiplus::StringFormatFlagsNoWrap);
|
||||
m_StringFormat.SetFormatFlags(Gdiplus::StringFormatFlagsNoClip | Gdiplus::StringFormatFlagsNoWrap);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user