diff options
| author | Felipe Borges <felipeborges@gnome.org> | 2017-02-22 14:43:34 +0100 |
|---|---|---|
| committer | Felipe Borges <felipeborges@gnome.org> | 2017-02-26 12:52:29 +0100 |
| commit | 2c7fc8653d17c8e57de577469c601c308ee73fbd (patch) | |
| tree | aec874179845d08c00edc2785ef7e05c6e99ee29 | |
| parent | 1de145a10b9017f567291eabccd099725250a226 (diff) | |
| download | gnome-control-center-2c7fc8653d17c8e57de577469c601c308ee73fbd.tar.gz | |
printers: Tweak the printer supply level bar
Make the supply level bar size, margin, border, background, and
saturation match the mockups at
https://wiki.gnome.org/Design/SystemSettings/Printers#Guidelines
Even though we would obtain primary colors by querying the printer
supply info, it is more eye-candy to desaturate (tone down) the
colors in the UI.
https://bugzilla.gnome.org/show_bug.cgi?id=779075
| -rw-r--r-- | panels/printers/pp-printer-entry.c | 34 | ||||
| -rw-r--r-- | panels/printers/printer-entry.ui | 4 |
2 files changed, 32 insertions, 6 deletions
diff --git a/panels/printers/pp-printer-entry.c b/panels/printers/pp-printer-entry.c index 7b76d72e0..bc28ffbc7 100644 --- a/panels/printers/pp-printer-entry.c +++ b/panels/printers/pp-printer-entry.c @@ -29,7 +29,7 @@ #include "pp-jobs-dialog.h" #include "pp-utils.h" -#define SUPPLY_BAR_HEIGHT 12 +#define SUPPLY_BAR_HEIGHT 8 struct _PpPrinterEntry { @@ -164,6 +164,27 @@ typedef struct gchar *marker_types; } InkLevelData; +/* To tone down the colors in the supply level bar + * we shade them by darkening the hue. + * + * Obs.: we don't know whether the color is already + * shaded. + * + */ +static void +tone_down_color (GdkRGBA *color, + gdouble hue_ratio, + gdouble saturation_ratio, + gdouble value_ratio) +{ + gdouble h, s, v; + + gtk_rgb_to_hsv (color->red, color->green, color->blue, + &h, &s, &v); + gtk_hsv_to_rgb (h * hue_ratio, s * saturation_ratio, v * value_ratio, + &color->red, &color->green, &color->blue); +} + static gboolean supply_levels_draw_cb (GtkWidget *widget, cairo_t *cr, @@ -233,13 +254,20 @@ supply_levels_draw_cb (GtkWidget *widget, value = ((MarkerItem*) tmp_list->data)->level; gdk_rgba_parse (&color, ((MarkerItem*) tmp_list->data)->color); + tone_down_color (&color, 1.0, 0.6, 0.9); if (value > 0) { display_value = value / 100.0 * (width - 3.0); gdk_cairo_set_source_rgba (cr, &color); - cairo_rectangle (cr, 3.5, 3.5, display_value, SUPPLY_BAR_HEIGHT - 3.0); + cairo_rectangle (cr, 2.0, 2.0, display_value, SUPPLY_BAR_HEIGHT); cairo_fill (cr); + + tone_down_color (&color, 1.0, 1.0, 0.85); + gdk_cairo_set_source_rgba (cr, &color); + cairo_set_line_width (cr, 1.0); + cairo_rectangle (cr, 1.5, 1.5, display_value, SUPPLY_BAR_HEIGHT + 1); + cairo_stroke (cr); } if (tooltip_text) @@ -256,7 +284,7 @@ supply_levels_draw_cb (GtkWidget *widget, ((MarkerItem*) tmp_list->data)->name); } - gtk_render_frame (context, cr, 1, 1, width - 1, SUPPLY_BAR_HEIGHT + 3); + gtk_render_frame (context, cr, 1, 1, width - 1, SUPPLY_BAR_HEIGHT); for (tmp_list = markers; tmp_list; tmp_list = tmp_list->next) { diff --git a/panels/printers/printer-entry.ui b/panels/printers/printer-entry.ui index 82de74afc..28e1f66e9 100644 --- a/panels/printers/printer-entry.ui +++ b/panels/printers/printer-entry.ui @@ -249,9 +249,7 @@ <property name="halign">start</property> <property name="height_request">18</property> <property name="width_request">300</property> - <style> - <class name="background"/> - </style> + <property name="border_width">2</property> <child> <object class="GtkDrawingArea" id="supply_drawing_area"> |