From e4a481785d8007dc6e0d2a9666da7b61a45f9934 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 12 May 2005 14:31:45 +0000 Subject: Fix drawing of non-square round boxes. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4333 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_plastic.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/fl_plastic.cxx b/src/fl_plastic.cxx index 75b0bbc5f..a3c1cbe1f 100644 --- a/src/fl_plastic.cxx +++ b/src/fl_plastic.cxx @@ -265,8 +265,11 @@ static void thin_up_box(int x, int y, int w, int h, Fl_Color c) { static void up_round(int x, int y, int w, int h, Fl_Color c) { - shade_round(x + 1, y + 1, w - 2, h - 3, "RVQNOPQRSTUVWVQ", c); - frame_round(x, y, w, h - 1, "IJLM", c); + if (w != h) up_box(x, y, w, h, c); + else { + shade_round(x + 1, y + 1, w - 2, h - 3, "RVQNOPQRSTUVWVQ", c); + frame_round(x, y, w, h - 1, "IJLM", c); + } } @@ -282,8 +285,11 @@ static void down_box(int x, int y, int w, int h, Fl_Color c) { static void down_round(int x, int y, int w, int h, Fl_Color c) { - shade_round(x + 2, y + 2, w - 4, h - 5, "STUVWWWVT", c); - frame_round(x, y, w, h - 1, "MLJI", c); + if (w != h) down_box(x, y, w, h, c); + else { + shade_round(x + 2, y + 2, w - 4, h - 5, "STUVWWWVT", c); + frame_round(x, y, w, h - 1, "MLJI", c); + } } -- cgit v1.2.3