chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

String meter: Fixed issues with ClipString=2

Browse Source
This commit is contained in:
Brian Ferguson 2013-01-28 00:38:26 -07:00
parent 8ecc6105e4
commit c0d969f4b6
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Library/MeterString.cpp
View File

@ -672,24 +672,16 @@ bool CMeterString::DrawString(Graphics& graphics, RectF* rect)
CharacterRange range(0, stringLen); CharacterRange range(0, stringLen);
stringFormat.SetMeasurableCharacterRanges(1, &range); stringFormat.SetMeasurableCharacterRanges(1, &range);
if (m_ClipType == CLIP_ON || (m_NeedsClipping && m_ClipType == CLIP_AUTO)) if (m_ClipType == CLIP_ON || (m_NeedsClipping && m_ClipType == CLIP_AUTO) ||
m_ClipType == CLIP_AUTO && m_WDefined && m_HDefined)
{ {
stringFormat.SetTrimming(StringTrimmingEllipsisCharacter); stringFormat.SetTrimming(StringTrimmingEllipsisCharacter);
} }
else else
{
// Special case
if (m_ClipType == CLIP_AUTO && m_WDefined && m_HDefined)
{
stringFormat.SetTrimming(StringTrimmingEllipsisCharacter);
stringFormat.SetFormatFlags(StringFormatFlagsNoClip);
}
else
{ {
stringFormat.SetTrimming(StringTrimmingNone); stringFormat.SetTrimming(StringTrimmingNone);
stringFormat.SetFormatFlags(StringFormatFlagsNoClip | StringFormatFlagsNoWrap); stringFormat.SetFormatFlags(StringFormatFlagsNoClip | StringFormatFlagsNoWrap);
} }
}
REAL x = (REAL)GetX(); REAL x = (REAL)GetX();
REAL y = (REAL)GetY(); REAL y = (REAL)GetY();
@ -719,8 +711,15 @@ bool CMeterString::DrawString(Graphics& graphics, RectF* rect)
{ {
if (m_ClipStringW == -1) if (m_ClipStringW == -1)
{ {
// Text does not fit in defined height, clip it
if (rect->Height > (REAL)m_H)
{
m_NeedsClipping = true;
}
rect->Height = (REAL)m_H; rect->Height = (REAL)m_H;
updateSize = false; updateSize = false;
} }
else else
{ {
@ -741,6 +740,13 @@ bool CMeterString::DrawString(Graphics& graphics, RectF* rect)
{ {
if (m_ClipStringW == -1) if (m_ClipStringW == -1)
{ {
// Clip text if already larger than ClipStringH
if (m_ClipStringH != -1 && rect->Height > (REAL)m_ClipStringH)
{
m_NeedsClipping = true;
rect->Height = (REAL)m_ClipStringH;
}
updateSize = false; updateSize = false;
} }
else if (m_ClipStringH == -1) else if (m_ClipStringH == -1)
@ -783,9 +789,9 @@ bool CMeterString::DrawString(Graphics& graphics, RectF* rect)
if (status == Ok && lines != 0) if (status == Ok && lines != 0)
{ {
rect->Width = w; rect->Width = w;
rect->Height = h * (REAL)lines; rect->Height = layout.Height;
if ((m_ClipStringH != -1 && rect->Height > m_ClipStringH) || (m_HDefined && rect->Height > (REAL)m_H)) if (m_HDefined || (m_ClipStringH != -1 && rect->Height > m_ClipStringH))
{ {
rect->Height = (REAL)(m_HDefined ? m_H : m_ClipStringH); rect->Height = (REAL)(m_HDefined ? m_H : m_ClipStringH);
} }