Author: AlbrechtS
Date: 2011-01-11 05:40:26 -0800 (Tue, 11 Jan 2011)
New Revision: 8258
Log:
Reverting unintentionally committed experimental code in r8256. Sorry.
Modified:
branches/branch-1.3/src/Fl_Text_Display.cxx
branches/branch-1.3/test/editor.cxx
Modified: branches/branch-1.3/src/Fl_Text_Display.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Text_Display.cxx 2011-01-11 13:07:10 UTC (rev
8257)
+++ branches/branch-1.3/src/Fl_Text_Display.cxx 2011-01-11 13:40:26 UTC (rev
8258)
@@ -356,13 +356,11 @@
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 @@
/* 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();
Modified: branches/branch-1.3/test/editor.cxx
===================================================================
--- branches/branch-1.3/test/editor.cxx 2011-01-11 13:07:10 UTC (rev 8257)
+++ branches/branch-1.3/test/editor.cxx 2011-01-11 13:40:26 UTC (rev 8258)
@@ -776,8 +776,7 @@
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]),
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
