Browse Source

Respect selection color in monitor widget

We should have a consistent color set over all widgets.
pull/1646/head
Pierre Ossman 2 years ago
parent
commit
6160457965

+ 2
- 3
vncviewer/fltk/Fl_Monitor_Arrangement.cxx View File

@@ -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);
}
}


+ 0
- 1
vncviewer/fltk/Fl_Monitor_Arrangement.h View File

@@ -48,7 +48,6 @@ protected:
virtual void draw();

private:
const Fl_Color SELECTION_COLOR;
const Fl_Color AVAILABLE_COLOR;
typedef std::map<int, Fl_Button *> MonitorMap;
MonitorMap monitors;

Loading…
Cancel
Save