diff options
| -rw-r--r-- | src/Fl_Text_Display.cxx | 10 | ||||
| -rw-r--r-- | test/editor.cxx | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 7cee0df30..f69c08772 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -356,13 +356,11 @@ 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); } @@ -389,14 +387,8 @@ 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 (1) // original h-scrollbar code - if ((scrollbar_align() & (FL_ALIGN_TOP|FL_ALIGN_BOTTOM)) && + 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(); diff --git a/test/editor.cxx b/test/editor.cxx index 16ef737c0..ffd8c1d57 100644 --- a/test/editor.cxx +++ b/test/editor.cxx @@ -776,8 +776,7 @@ Fl_Window* new_view() { w->editor = new Fl_Text_Editor(0, 30, 660, 370); w->editor->textfont(FL_COURIER); w->editor->textsize(TS); - // - w->editor->wrap_mode(Fl_Text_Editor::WRAP_AT_BOUNDS, 0); + //w->editor->wrap_mode(Fl_Text_Editor::WRAP_AT_BOUNDS, 250); w->editor->buffer(textbuf); w->editor->highlight_data(stylebuf, styletable, sizeof(styletable) / sizeof(styletable[0]), |