Author: matt
Date: 2012-05-03 03:56:30 -0700 (Thu, 03 May 2012)
New Revision: 9441
Log:
Fixed HelpBrowser
Modified:
branches/branch-3.0/src/fltk3/HelpView.cxx
branches/branch-3.0/test/help.cxx
Modified: branches/branch-3.0/src/fltk3/HelpView.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/HelpView.cxx 2012-05-02 22:38:47 UTC (rev
9440)
+++ branches/branch-3.0/src/fltk3/HelpView.cxx 2012-05-03 10:56:30 UTC (rev
9441)
@@ -461,18 +461,18 @@
hh = h();
i = 0;
- draw_box(b, x(), y(), ww, hh, bgcolor_);
+ draw_box(b, 0, 0, ww, hh, bgcolor_);
if ( hscrollbar_.visible() || scrollbar_.visible() ) {
int scrollsize = scrollbar_size_ ? scrollbar_size_ :
fltk3::scrollbar_size();
int hor_vis = hscrollbar_.visible();
int ver_vis = scrollbar_.visible();
// Scrollbar corner
- int scorn_x = x() + ww - (ver_vis?scrollsize:0) - fltk3::box_dw(b) +
fltk3::box_dx(b);
- int scorn_y = y() + hh - (hor_vis?scrollsize:0) - fltk3::box_dh(b) +
fltk3::box_dy(b);
+ int scorn_x = ww - (ver_vis?scrollsize:0) - fltk3::box_dw(b) +
fltk3::box_dx(b);
+ int scorn_y = hh - (hor_vis?scrollsize:0) - fltk3::box_dh(b) +
fltk3::box_dy(b);
if ( hor_vis ) {
if ( hscrollbar_.h() != scrollsize ) { // scrollsize changed?
- hscrollbar_.resize(x(), scorn_y, scorn_x - x(), scrollsize);
+ hscrollbar_.resize(0, scorn_y, scorn_x, scrollsize);
init_sizes();
}
draw_child(hscrollbar_);
@@ -480,7 +480,7 @@
}
if ( ver_vis ) {
if ( scrollbar_.w() != scrollsize ) { // scrollsize changed?
- scrollbar_.resize(scorn_x, y(), scrollsize, scorn_y - y());
+ scrollbar_.resize(scorn_x, 0, scrollsize, scorn_y);
init_sizes();
}
draw_child(scrollbar_);
@@ -503,7 +503,7 @@
current_pos = 0;
// Clip the drawing to the inside of the box...
- fltk3::push_clip(x() + fltk3::box_dx(b), y() + fltk3::box_dy(b),
+ fltk3::push_clip(fltk3::box_dx(b), fltk3::box_dy(b),
ww - fltk3::box_dw(b), hh - fltk3::box_dh(b));
fltk3::color(textcolor_);
@@ -545,11 +545,11 @@
hh = 0;
}
- hv_draw(buf, xx + x() - leftline_, yy + y());
+ hv_draw(buf, xx - leftline_, yy);
if (underline) {
xtra_ww = isspace((*ptr)&255)?(int)fltk3::width(' '):0;
- fltk3::xyline(xx + x() - leftline_, yy + y() + 1,
- xx + x() - leftline_ + ww + xtra_ww);
+ fltk3::xyline(xx - leftline_, yy + 1,
+ xx - leftline_ + ww + xtra_ww);
}
current_pos = (int)(ptr - value_);
@@ -568,9 +568,9 @@
*s = '\0';
s = buf;
- hv_draw(buf, xx + x() - leftline_, yy + y());
- if (underline) fltk3::xyline(xx + x() - leftline_, yy + y() + 1,
- xx + x() - leftline_ +
+ hv_draw(buf, xx - leftline_, yy);
+ if (underline) fltk3::xyline(xx - leftline_, yy + 1,
+ xx - leftline_ +
(int)fltk3::width(buf));
current_pos = (int)(ptr - value_);
@@ -600,10 +600,10 @@
*s = '\0';
s = buf;
- hv_draw(buf, xx + x() - leftline_, yy + y());
+ hv_draw(buf, xx - leftline_, yy);
ww = (int)fltk3::width(buf);
- if (underline) fltk3::xyline(xx + x() - leftline_, yy + y() + 1,
- xx + x() - leftline_ + ww);
+ if (underline) fltk3::xyline(xx - leftline_, yy + 1,
+ xx - leftline_ + ww);
xx += ww;
current_pos = (int)(ptr - value_);
}
@@ -667,8 +667,7 @@
}
else if (strcasecmp(buf, "HR") == 0)
{
- fltk3::line(block->x + x(), yy + y(), block->w + x(),
- yy + y());
+ fltk3::line(block->x, yy, block->w, yy);
if (line < 31)
line ++;
@@ -717,7 +716,7 @@
// buf[fl_unicode2utf(b, 1, buf)] = 0;
unsigned dstlen = fltk3::utf8fromwc(buf, 8, b, 1);
buf[dstlen] = 0;
- hv_draw(buf, xx - fsize + x() - leftline_, yy + y());
+ hv_draw(buf, xx - fsize - leftline_, yy);
}
pushfont(font, fsize);
@@ -799,9 +798,6 @@
ty = 0;
}
- tx += x();
- ty += y();
-
if (block->bgcolor != bgcolor_)
{
fltk3::color(block->bgcolor);
@@ -884,8 +880,8 @@
}
if (img) {
- img->draw(xx + x() - leftline_,
- yy + y() - fltk3::height() + fltk3::descent() + 2);
+ img->draw(xx - leftline_,
+ yy - fltk3::height() + fltk3::descent() + 2);
}
xx += ww;
@@ -900,7 +896,7 @@
*s = '\0';
s = buf;
- hv_draw(buf, xx + x() - leftline_, yy + y());
+ hv_draw(buf, xx - leftline_, yy);
if (line < 31)
line ++;
@@ -979,9 +975,9 @@
if (s > buf && !head)
{
- hv_draw(buf, xx + x() - leftline_, yy + y());
- if (underline) fltk3::xyline(xx + x() - leftline_, yy + y() + 1,
- xx + x() - leftline_ + ww);
+ hv_draw(buf, xx - leftline_, yy);
+ if (underline) fltk3::xyline(xx - leftline_, yy + 1,
+ xx - leftline_ + ww);
current_pos = (int)(ptr - value_);
}
}
@@ -1837,13 +1833,13 @@
if (size_ < (h() - dh)) {
scrollbar_.hide();
- hscrollbar_.resize(x() + fltk3::box_dx(b), y() + h() - ss - dy,
+ hscrollbar_.resize(fltk3::box_dx(b), h() - ss - dy,
w() - fltk3::box_dw(b), ss);
} else {
scrollbar_.show();
- scrollbar_.resize(x() + w() - ss - dx, y() + fltk3::box_dy(b),
+ scrollbar_.resize(w() - ss - dx, fltk3::box_dy(b),
ss, h() - ss - fltk3::box_dh(b));
- hscrollbar_.resize(x() + fltk3::box_dx(b), y() + h() - ss - dy,
+ hscrollbar_.resize(fltk3::box_dx(b), h() - ss - dy,
w() - ss - fltk3::box_dw(b), ss);
}
} else {
@@ -1851,7 +1847,7 @@
if (size_ < (h() - dh)) scrollbar_.hide();
else {
- scrollbar_.resize(x() + w() - ss - dx, y() + fltk3::box_dy(b),
+ scrollbar_.resize(w() - ss - dx, fltk3::box_dy(b),
ss, h() - fltk3::box_dh(b));
scrollbar_.show();
}
@@ -2946,8 +2942,8 @@
{
static fltk3::HelpLink *linkp; // currently clicked link
- int xx = fltk3::event_x() - x() + leftline_;
- int yy = fltk3::event_y() - y() + topline_;
+ int xx = fltk3::event_x()+ leftline_;
+ int yy = fltk3::event_y()+ topline_;
switch (event)
{
@@ -3039,6 +3035,8 @@
hscrollbar_(xx, yy + hh - fltk3::scrollbar_size(),
ww - fltk3::scrollbar_size(), fltk3::scrollbar_size())
{
+ set_group_relative();
+
color(fltk3::BACKGROUND2_COLOR, fltk3::SELECTION_COLOR);
title_[0] = '\0';
@@ -3242,10 +3240,10 @@
Widget::resize(xx, yy, ww, hh);
int scrollsize = scrollbar_size_ ? scrollbar_size_ : fltk3::scrollbar_size();
- scrollbar_.resize(x() + w() - scrollsize - fltk3::box_dw(b) +
fltk3::box_dx(b),
- y() + fltk3::box_dy(b), scrollsize, h() - scrollsize -
fltk3::box_dh(b));
- hscrollbar_.resize(x() + fltk3::box_dx(b),
- y() + h() - scrollsize - fltk3::box_dh(b) +
fltk3::box_dy(b),
+ scrollbar_.resize(w() - scrollsize - fltk3::box_dw(b) + fltk3::box_dx(b),
+ fltk3::box_dy(b), scrollsize, h() - scrollsize -
fltk3::box_dh(b));
+ hscrollbar_.resize(fltk3::box_dx(b),
+ h() - scrollsize - fltk3::box_dh(b) + fltk3::box_dy(b),
w() - scrollsize - fltk3::box_dw(b), scrollsize);
format();
Modified: branches/branch-3.0/test/help.cxx
===================================================================
--- branches/branch-3.0/test/help.cxx 2012-05-02 22:38:47 UTC (rev 9440)
+++ branches/branch-3.0/test/help.cxx 2012-05-03 10:56:30 UTC (rev 9441)
@@ -65,21 +65,19 @@
{
fltk3::HelpDialog *help; // Help dialog
-
help = new fltk3::HelpDialog;
int argn = 1;
#ifdef USING_XCODE
- if (argc>argn && strncmp(argv[1], "-psn_", 5)==0)
- argn++;
set_app_dir();
- if (argc <= argn)
- help->load("../../../../documentation/html/intro.html");
- else
- help->load(argv[argn]);
+ //if (argc <= argn)
+ help->load("/Users/matt/mygcc/gcc-4.6.1/INSTALL/index.html");
+ //help->load("../../../../documentation/html/intro.html");
+ //else
+ //help->load(argv[argn]);
#else
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
