applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Paint the outputs with the color from GnomeRRLabeler

Browse source 
Signed-off-by: Federico Mena Quintero <federico@novell.com>

svn path=/trunk/; revision=8864
This commit is contained in:
Federico Mena Quintero 2008-08-16 02:00:48 +00:00 • committed by Federico Mena Quintero
parent a4a7ac50fb
commit e0ec9acbbb
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/display/ChangeLog
View file

@ -1,3 +1,9 @@
2008-08-13 Federico Mena Quintero <federico@novell.com>
* xrandr-capplet.c (paint_output): Instead of using hard-coded
colors for the rectangles that represent the monitors, get the
colors from the GnomeRRLabeler.
2008-08-13 Federico Mena Quintero <federico@novell.com> 2008-08-13 Federico Mena Quintero <federico@novell.com>
* xrandr-capplet.c (on_screen_changed): Create a GnomeRRLabeler * xrandr-capplet.c (on_screen_changed): Create a GnomeRRLabeler

20
capplets/display/xrandr-capplet.c
View file

@ -1360,6 +1360,8 @@ paint_output (App *app, cairo_t *cr, int i)
PangoRectangle extent; PangoRectangle extent;
GdkRectangle viewport; GdkRectangle viewport;
double angle; double angle;
GdkColor output_color;
double r, g, b;
cairo_save (cr); cairo_save (cr);
@ -1429,10 +1431,20 @@ paint_output (App *app, cairo_t *cr, int i)
cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5); cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5);
cairo_clip_preserve (cr); cairo_clip_preserve (cr);
if (output->on) gnome_rr_labeler_get_color_for_output (app->labeler, output, &output_color);
cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0); r = output_color.red / 65535.0;
else g = output_color.green / 65535.0;
cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 1.0); b = output_color.blue / 65535.0;
if (!output->on)
{
/* If the output is turned off, just darken the selected color */
r *= 0.2;
g *= 0.2;
b *= 0.2;
}
cairo_set_source_rgba (cr, r, g, b, 1.0);
foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (app->area), foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (app->area),
cr, on_output_event, output); cr, on_output_event, output);