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 TextBox drawing when we scroll it

Browse Source
This commit is contained in:
David Capello 2016-11-22 12:47:46 -03:00
parent 5828df1383
commit 0ed0ad287c
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/ui/theme.cpp
View File

@ -80,7 +80,7 @@ Theme* CurrentTheme::get()
}
void drawTextBox(Graphics* g, Widget* widget,
int* w, int* h, gfx::Color bg, gfx::Color fg)
int* w, int* h, gfx::Color bg, gfx::Color fg)
{
View* view = View::getView(widget);
char* text = const_cast<char*>(widget->text().c_str());
@ -88,31 +88,26 @@ void drawTextBox(Graphics* g, Widget* widget,
int x1, y1, x2, y2;
int x, y, chr, len;
gfx::Point scroll;
int viewport_w, viewport_h;
int textheight = widget->textHeight();
she::Font* font = widget->font();
char *beg_end, *old_end;
int width;
gfx::Rect vp;
if (view) {
gfx::Rect vp = view->viewportBounds()
.offset(-view->viewport()->bounds().origin());
x1 = vp.x;
y1 = vp.y;
viewport_w = vp.w;
viewport_h = vp.h;
vp = view->viewportBounds().offset(-widget->bounds().origin());
scroll = view->viewScroll();
}
else {
x1 = widget->clientBounds().x + widget->border().left();
y1 = widget->clientBounds().y + widget->border().top();
viewport_w = widget->clientBounds().w - widget->border().width();
viewport_h = widget->clientBounds().h - widget->border().height();
vp = widget->clientBounds();
vp.w -= widget->border().width();
vp.h -= widget->border().height();
scroll.x = scroll.y = 0;
}
x2 = x1 + viewport_w;
y2 = y1 + viewport_h;
x1 = widget->clientBounds().x;
y1 = widget->clientBounds().y;
x2 = vp.x + vp.w;
y2 = vp.y + vp.h;
chr = 0;
@ -127,27 +122,27 @@ void drawTextBox(Graphics* g, Widget* widget,
*w = 0;
}
else {
/* TODO modificable option? I don't think so, this is very internal stuff */
// TODO modificable option? I don't think so, this is very internal stuff
#if 0
/* shows more information in x-scroll 0 */
width = viewport_w;
// Shows more information in x-scroll 0
width = vp.w;
#else
/* make good use of the complete text-box */
// Make good use of the complete text-box
if (view) {
gfx::Size maxSize = view->getScrollableSize();
width = MAX(viewport_w, maxSize.w);
width = MAX(vp.w, maxSize.w);
}
else {
width = viewport_w;
width = vp.w;
}
#endif
}
}
// Draw line-by-line
y = y1 - scroll.y;
y = y1;
for (beg=end=text; end; ) {
x = x1 - scroll.x;
x = x1;
// Without word-wrap
if (!(widget->align() & WORDWRAP)) {
@ -208,7 +203,8 @@ void drawTextBox(Graphics* g, Widget* widget,
xout = x;
g->drawUIString(beg, fg, bg, gfx::Point(xout, y));
g->fillAreaBetweenRects(bg,
g->fillAreaBetweenRects(
bg,
gfx::Rect(x1, y, x2 - x1, textheight),
gfx::Rect(xout, y, len, textheight));
}