mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Horizontal scrollbar in TextDisplay is not shown if text wrappes at the right edge

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9092 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2011-09-30 10:09:16 +00:00
parent 00e8e44cf4
commit 41876bf00a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Fl_Text_Display.cxx
View File

@ -359,7 +359,8 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) {
}
/*
Decide if the horizontal scrollbar needs to be visible. If there
Decide if the horizontal scrollbar needs to be visible. If the text
wraps at the right edge, do not draw a horizontal scrollbar. Otherwise, if there
is a vertical scrollbar, a horizontal is always created too. This
is because the alternatives are unattractive:
* Dynamically creating a horizontal scrollbar based on the currently
@ -382,18 +383,19 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) {
if (scrollbar_align() & (FL_ALIGN_TOP|FL_ALIGN_BOTTOM) &&
(mVScrollBar->visible() || longest_vline() > text_area.w))
{
if (!mHScrollBar->visible()) {
char wrap_at_bounds = mContinuousWrap && (mWrapMarginPix==0);
if (!mHScrollBar->visible() && !wrap_at_bounds) {
mHScrollBar->set_visible();
again = 1; // loop again to see if we now need vert. & recalc sizes
}
if (scrollbar_align() & FL_ALIGN_TOP) {
text_area.y = Y + scrollbar_width()+TOP_MARGIN;
text_area.h = H - scrollbar_width()-TOP_MARGIN-BOTTOM_MARGIN;
text_area.h = H - (wrap_at_bounds?0:scrollbar_width())-TOP_MARGIN-BOTTOM_MARGIN;
mHScrollBar->resize(text_area.x-LEFT_MARGIN, Y,
text_area.w+LEFT_MARGIN+RIGHT_MARGIN, scrollbar_width());
} else {
text_area.y = Y+TOP_MARGIN;
text_area.h = H - scrollbar_width()-TOP_MARGIN-BOTTOM_MARGIN;
text_area.h = H - (wrap_at_bounds?0:scrollbar_width())-TOP_MARGIN-BOTTOM_MARGIN;
mHScrollBar->resize(text_area.x-LEFT_MARGIN, Y+H-scrollbar_width(),
text_area.w+LEFT_MARGIN+RIGHT_MARGIN, scrollbar_width());
}