From 725efb3569ac50ce5dd8affcf19616f24a8150a7 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sun, 12 Nov 2006 20:44:12 +0000 Subject: STR #1492: Fl_Progress was using the wrong width to calculate progress git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5540 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Progress.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Fl_Progress.cxx b/src/Fl_Progress.cxx index 88a8ad773..69e76492c 100644 --- a/src/Fl_Progress.cxx +++ b/src/Fl_Progress.cxx @@ -67,7 +67,7 @@ void Fl_Progress::draw() // Draw the progress bar... if (maximum_ > minimum_) - progress = (int)(tw * (value_ - minimum_) / (maximum_ - minimum_) + 0.5f); + progress = (int)(w() * (value_ - minimum_) / (maximum_ - minimum_) + 0.5f); else progress = 0; @@ -83,12 +83,14 @@ void Fl_Progress::draw() labelcolor(c); - fl_clip(tx + progress, y(), w() - progress, h()); - draw_box(box(), x(), y(), w(), h(), active_r() ? color() : fl_inactive(color())); - draw_label(tx, y() + by, tw, h() - bh); - fl_pop_clip(); + if (progress