diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2011-01-11 13:06:15 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2011-01-11 13:06:15 +0000 |
| commit | 313352b55f85716060a763a112db4214fbffeedb (patch) | |
| tree | 948ac845a6f0bf80352d23cb19cf2a808369bd96 /src/Fl_Text_Display.cxx | |
| parent | b6d2207550758827869934e0153dace8c4fc8bd2 (diff) | |
Updated documentation/README to reflect the new distribution of
pre-generated documentation as separate downloads.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8256 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Text_Display.cxx')
| -rw-r--r-- | src/Fl_Text_Display.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index f69c08772..7cee0df30 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -356,11 +356,13 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { if (scrollbar_align() & FL_ALIGN_LEFT) { text_area.x = X+scrollbar_width()+LEFT_MARGIN; text_area.w = W-scrollbar_width()-LEFT_MARGIN-RIGHT_MARGIN; + mWrapMarginPix = text_area.w - 2; mVScrollBar->resize(X, text_area.y-TOP_MARGIN, scrollbar_width(), text_area.h+TOP_MARGIN+BOTTOM_MARGIN); } else { text_area.x = X+LEFT_MARGIN; text_area.w = W-scrollbar_width()-LEFT_MARGIN-RIGHT_MARGIN; + mWrapMarginPix = text_area.w - 2; mVScrollBar->resize(X+W-scrollbar_width(), text_area.y-TOP_MARGIN, scrollbar_width(), text_area.h+TOP_MARGIN+BOTTOM_MARGIN); } @@ -387,8 +389,14 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { /* WAS: Suggestion: Try turning the horizontal scrollbar on when you first see a line that is too wide in the window, but then don't turn it off (ie mix both of your solutions). */ - if (scrollbar_align() & (FL_ALIGN_TOP|FL_ALIGN_BOTTOM) && +#if (1) // original h-scrollbar code + if ((scrollbar_align() & (FL_ALIGN_TOP|FL_ALIGN_BOTTOM)) && (mVScrollBar->visible() || longest_vline() > text_area.w)) +#else // modified h-scrollbar code + if ((scrollbar_align() & (FL_ALIGN_TOP|FL_ALIGN_BOTTOM)) && + (mVScrollBar->visible() || longest_vline() > text_area.w) && + !mContinuousWrap ) +#endif // modified h-scrollbar code { if (!mHScrollBar->visible()) { mHScrollBar->set_visible(); |