diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-03-31 20:59:10 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-03-31 20:59:10 +0000 |
| commit | e50e551f7ceba833ad5d1dff1d89b247f872eb47 (patch) | |
| tree | 00ed78a6c5e329394908fe94223bffc9d0e0fbc8 | |
| parent | 782abe6de6c801f48f98fe55a6a9b8626d7bd4ec (diff) | |
Fl_Chart would draw outside its bounding box (STR #780)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4228 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | src/Fl_Chart.cxx | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -2,6 +2,9 @@ CHANGES IN FLTK 1.1.7 - Documentation fixes (STR #648, STR #692, STR #730, STR #744, STR #745) + - Menus and other pop-up windows now obey screen + boundaries on multi-screen displays (STR #781) + - Fl_Chart would draw outside its bounding box (STR #780) - Added Fl::screen_count() and Fl::screen_xywh() APIs to support multi-screen displays. - FLUID now supports direct creation of widget classes. diff --git a/src/Fl_Chart.cxx b/src/Fl_Chart.cxx index 5b4b2cf6b..376eee565 100644 --- a/src/Fl_Chart.cxx +++ b/src/Fl_Chart.cxx @@ -187,9 +187,9 @@ static void draw_piechart(int x,int y,int w,int h, double txc,tyc; /* temporary center */ double lh = fl_height(); /* compute center and radius */ - xc = x+w/2.0; yc = y+h/2.0; - rad = h/2.0 - lh; - if (special) { yc += 0.1*rad; rad = 0.9*rad;} + double h_denom = (special ? 2.3 : 2.0); + rad = (h - 2*lh)/h_denom/1.1; + xc = x+w/2.0; yc = y+h-1.1*rad-lh; /* compute sum of values */ tot = 0.0; for (i=0; i<numb; i++) |