From 6160457965973035a83292b4a3076f633cfb285e Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 14 Jan 2022 19:49:12 +0100 Subject: [PATCH] Respect selection color in monitor widget We should have a consistent color set over all widgets. --- vncviewer/fltk/Fl_Monitor_Arrangement.cxx | 5 ++--- vncviewer/fltk/Fl_Monitor_Arrangement.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vncviewer/fltk/Fl_Monitor_Arrangement.cxx b/vncviewer/fltk/Fl_Monitor_Arrangement.cxx index 3dddd801..7c72ff68 100644 --- a/vncviewer/fltk/Fl_Monitor_Arrangement.cxx +++ b/vncviewer/fltk/Fl_Monitor_Arrangement.cxx @@ -61,7 +61,6 @@ static const Fl_Boxtype FL_CHECKERED_BOX = FL_FREE_BOXTYPE; Fl_Monitor_Arrangement::Fl_Monitor_Arrangement( int x, int y, int w, int h) : Fl_Group(x, y, w, h), - SELECTION_COLOR(fl_lighter(FL_BLUE)), AVAILABLE_COLOR(fl_lighter(fl_lighter(fl_lighter(FL_BACKGROUND_COLOR)))) { // Used for required monitors. @@ -124,11 +123,11 @@ void Fl_Monitor_Arrangement::draw() if (is_required(iter->first)) { monitor->box(FL_CHECKERED_BOX); - monitor->color(SELECTION_COLOR); + monitor->color(FL_SELECTION_COLOR); } else { monitor->box(FL_BORDER_BOX); monitor->color(AVAILABLE_COLOR); - monitor->selection_color(SELECTION_COLOR); + monitor->selection_color(FL_SELECTION_COLOR); } } diff --git a/vncviewer/fltk/Fl_Monitor_Arrangement.h b/vncviewer/fltk/Fl_Monitor_Arrangement.h index b8e9ba78..c71dd199 100644 --- a/vncviewer/fltk/Fl_Monitor_Arrangement.h +++ b/vncviewer/fltk/Fl_Monitor_Arrangement.h @@ -48,7 +48,6 @@ protected: virtual void draw(); private: - const Fl_Color SELECTION_COLOR; const Fl_Color AVAILABLE_COLOR; typedef std::map MonitorMap; MonitorMap monitors; -- 2.39.5