From 281ec24c8f4b7daf7cc4e7c30b640cbe0b33d037 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Fri, 26 Apr 2024 12:42:11 +0200 Subject: Box types can now defined and draw their own focus frame, STR 2145, #659 --- src/Fl_Widget.cxx | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'src/Fl_Widget.cxx') diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx index c5b59f5db..bf2ff03d0 100644 --- a/src/Fl_Widget.cxx +++ b/src/Fl_Widget.cxx @@ -213,25 +213,7 @@ Fl_Widget::~Fl_Widget() { void Fl_Widget::draw_focus(Fl_Boxtype bt, int X, int Y, int W, int H, Fl_Color bg) const { if (!Fl::visible_focus()) return; if (!visible_focus()) return; - switch (bt) { - case FL_DOWN_BOX: - case FL_DOWN_FRAME: - case FL_THIN_DOWN_BOX: - case FL_THIN_DOWN_FRAME: - X ++; - Y ++; - default: - break; - } - X += Fl::box_dx(bt); - Y += Fl::box_dy(bt); - W -= Fl::box_dw(bt)+1; - H -= Fl::box_dh(bt)+1; - - Fl_Color savecolor = fl_color(); - fl_color(fl_contrast(FL_BLACK, bg)); - fl_focus_rect(X, Y, W, H); - fl_color(savecolor); + fl_draw_box_focus(bt, X, Y, W, H, FL_BLACK, bg); } void Fl_Widget::activate() { -- cgit v1.2.3