diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-06 17:57:25 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-06 19:54:37 (GMT) |
| commit | 622f2246ef31a05eb38e8f2ab3ac9c1bd9264920 (patch) | |
| tree | fb9009f6803f395c9da457039a823a0ffcdfc98a /src/interface/Label.cpp | |
| parent | f75a3c264235d5edf162fd0f7bf6e04d629704f9 (diff) | |
| download | powder-622f2246ef31a05eb38e8f2ab3ac9c1bd9264920.zip powder-622f2246ef31a05eb38e8f2ab3ac9c1bd9264920.tar.gz | |
Fix TPTScript 'set' function
Diffstat (limited to 'src/interface/Label.cpp')
| -rw-r--r-- | src/interface/Label.cpp | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/src/interface/Label.cpp b/src/interface/Label.cpp index 8a8055e..ee52fd8 100644 --- a/src/interface/Label.cpp +++ b/src/interface/Label.cpp @@ -266,6 +266,11 @@ void Label::updateSelection() } } +void Label::SetDisplayText(std::string newText) +{ + displayText = newText; +} + void Label::Draw(const Point& screenPos) { if(!drawn) @@ -282,6 +287,23 @@ void Label::Draw(const Point& screenPos) } Graphics * g = Engine::Ref().g; + std::string cDisplayText = displayText; + + if(!cDisplayText.length()) + { + if(selectionXL != -1 && selectionXH != -1) + { + cDisplayText = textFragments; + } + else + { + if(multiline) + cDisplayText = textLines; + else + cDisplayText = text; + } + } + if(multiline) { if(selectionXL != -1 && selectionXH != -1) @@ -298,21 +320,21 @@ void Label::Draw(const Point& screenPos) } else { g->fillrect(screenPos.X+textPosition.X+selectionXL, screenPos.Y+selectionYL+textPosition.Y-1, selectionXH-(selectionXL), 10, 255, 255, 255, 255); } - g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, textFragments, textColour.Red, textColour.Green, textColour.Blue, 255); + g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, cDisplayText, textColour.Red, textColour.Green, textColour.Blue, 255); } else { - g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, textLines, textColour.Red, textColour.Green, textColour.Blue, 255); + g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, cDisplayText, textColour.Red, textColour.Green, textColour.Blue, 255); } } else { if(selectionXL != -1 && selectionXH != -1) { g->fillrect(screenPos.X+textPosition.X+selectionXL, screenPos.Y+textPosition.Y-1, selectionXH-(selectionXL), 10, 255, 255, 255, 255); - g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, textFragments, textColour.Red, textColour.Green, textColour.Blue, 255); + g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, cDisplayText, textColour.Red, textColour.Green, textColour.Blue, 255); } else { - g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, text, textColour.Red, textColour.Green, textColour.Blue, 255); + g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, cDisplayText, textColour.Red, textColour.Green, textColour.Blue, 255); } } } |