mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-29 02:40:47 +02:00
Code Issues Projects Releases Wiki Activity

Fix text selection issue in #65

Browse Source
This commit is contained in:
Simon Robertshaw
2012-08-03 17:58:13 +01:00
parent 40e5ce5d37
commit 57f949ecfb
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/interface/Label.cpp
View File

@@ -35,6 +35,11 @@ void Label::SetMultiline(bool status)
{ {
updateMultiline(); updateMultiline();
updateSelection(); updateSelection();
TextPosition(textLines);
}
else
{
TextPosition(text);
} }
} }
@@ -45,8 +50,12 @@ void Label::SetText(std::string text)
{ {
updateMultiline(); updateMultiline();
updateSelection(); updateSelection();
TextPosition(textLines);
} }
else
{
TextPosition(text); TextPosition(text);
}
} }
void Label::updateMultiline() void Label::updateMultiline()
@@ -68,7 +77,7 @@ void Label::updateMultiline()
if(nextSpace) if(nextSpace)
nextSpace[0] = 0; nextSpace[0] = 0;
int width = Graphics::textwidth(currentWord); int width = Graphics::textwidth(currentWord);
if(width+currentWidth > Size.X-6) if(width+currentWidth >= Size.X-(Appearance.Margin.Left+Appearance.Margin.Right))
{ {
currentWidth = width; currentWidth = width;
if(currentWord!=rawText) if(currentWord!=rawText)