mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 13:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix widget border in drawTextBox()

Browse Source
This commit is contained in:
David Capello 2016-12-06 21:29:14 -03:00
parent 6abe417328
commit fec4e27d8e
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ui/theme.cpp
View File

@ -85,7 +85,7 @@ void drawTextBox(Graphics* g, Widget* widget,
View* view = View::getView(widget);
char* text = const_cast<char*>(widget->text().c_str());
char* beg, *end;
int x1, y1, x2, y2;
int x1, y1;
int x, y, chr, len;
gfx::Point scroll;
int textheight = widget->textHeight();
@ -100,14 +100,10 @@ void drawTextBox(Graphics* g, Widget* widget,
}
else {
vp = widget->clientBounds();
vp.w -= widget->border().width();
vp.h -= widget->border().height();
scroll.x = scroll.y = 0;
}
x1 = widget->clientBounds().x;
y1 = widget->clientBounds().y;
x2 = vp.x + vp.w;
y2 = vp.y + vp.h;
x1 = widget->clientBounds().x + widget->border().left();
y1 = widget->clientBounds().y + widget->border().top();
// Fill background
if (g)
@ -117,7 +113,7 @@ void drawTextBox(Graphics* g, Widget* widget,
// Without word-wrap
if (!(widget->align() & WORDWRAP)) {
width = widget->clientBounds().w;
width = widget->clientChildrenBounds().w;
}
// With word-wrap
else {
@ -139,6 +135,7 @@ void drawTextBox(Graphics* g, Widget* widget,
else {
width = vp.w;
}
width -= widget->border().width();
#endif
}
}
@ -167,7 +164,7 @@ void drawTextBox(Graphics* g, Widget* widget,
}
// To here we can print
if ((old_end) && (x+font->textLength(beg) > x1-scroll.x+width)) {
if ((old_end) && (x+font->textLength(beg) > x1+width-scroll.x)) {
if (end)
*end = chr;