diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Tabs.cxx | 18 | ||||
| -rw-r--r-- | src/fl_plastic.cxx | 8 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/Fl_Tabs.cxx b/src/Fl_Tabs.cxx index e046ef16e..dc75c064f 100644 --- a/src/Fl_Tabs.cxx +++ b/src/Fl_Tabs.cxx @@ -288,16 +288,13 @@ void Fl_Tabs::draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int what) { Fl_Color c = sel ? selection_color() : o->selection_color(); - draw_box(box(), x1, y(), W, H, c); - - // Make sure that the label contrasts the tab color... - c = fl_contrast(o->labelcolor(), c); + draw_box(box(), x1, y(), W, H + 10, c); // Save the previous label color Fl_Color oc = o->labelcolor(); - // Draw the label using the contrast color... - o->labelcolor(c); + // Draw the label using the current color... + o->labelcolor(sel ? labelcolor() : o->labelcolor()); o->draw_label(x1, y(), W, H, FL_ALIGN_CENTER); // Restore the original label color... @@ -317,16 +314,13 @@ void Fl_Tabs::draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int what) { Fl_Color c = sel ? selection_color() : o->selection_color(); - draw_box(box(), x1, y() + h() - H, W, H, c); - - // Make sure that the label contrasts the tab color... - c = fl_contrast(o->labelcolor(), c); + draw_box(box(), x1, y() + h() - H - 10, W, H + 10, c); // Save the previous label color Fl_Color oc = o->labelcolor(); - // Draw the label using the contrast color... - o->labelcolor(c); + // Draw the label using the current color... + o->labelcolor(sel ? labelcolor() : o->labelcolor()); o->draw_label(x1, y() + h() - H, W, H, FL_ALIGN_CENTER); // Restore the original label color... diff --git a/src/fl_plastic.cxx b/src/fl_plastic.cxx index a3c1cbe1f..e8bbb9ffa 100644 --- a/src/fl_plastic.cxx +++ b/src/fl_plastic.cxx @@ -267,8 +267,8 @@ 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) { 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); + shade_round(x + 1, y + 1, w - 2, h - 2, "RVQNOPQRSTUVWVQ", c); + frame_round(x, y, w, h, "IJLM", c); } } @@ -287,8 +287,8 @@ 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) { 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); + shade_round(x + 2, y + 2, w - 4, h - 4, "STUVWWWVT", c); + frame_round(x, y, w, h, "MLJI", c); } } |