diff options
| author | raveit65 <[email protected]> | 2016-06-03 20:18:53 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-06-07 16:44:56 +0200 |
| commit | b8f642a86d8d18747a0b970b4420435603ee5a5f (patch) | |
| tree | 51cc7f268a4e60e1a531e662b1dede6d98c868ac /src/gsd-media-keys-window.c | |
| parent | 0d633f368b7ddc943ed51ac93d1a389f41a57906 (diff) | |
| download | mate-power-manager-b8f642a86d8d18747a0b970b4420435603ee5a5f.tar.bz2 mate-power-manager-b8f642a86d8d18747a0b970b4420435603ee5a5f.tar.xz | |
GTK+3 media-keys: sync code with m-s-d and drop include mate-desktop-utils.h
This makes gtk3 migration easier as m-p-m use only
<libmate-desktop/mate-aboutdialog.h yet.
Diffstat (limited to 'src/gsd-media-keys-window.c')
| -rw-r--r-- | src/gsd-media-keys-window.c | 74 |
1 files changed, 46 insertions, 28 deletions
diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c index 5bcca8e..cec33f9 100644 --- a/src/gsd-media-keys-window.c +++ b/src/gsd-media-keys-window.c @@ -30,11 +30,6 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#define MATE_DESKTOP_USE_UNSTABLE_API -#include <libmate-desktop/mate-desktop-utils.h> -#endif - #include "gsd-media-keys-window.h" #define MSD_MEDIA_KEYS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_MEDIA_KEYS_WINDOW, MsdMediaKeysWindowPrivate)) @@ -408,32 +403,47 @@ draw_volume_boxes (MsdMediaKeysWindow *window, { gdouble x1; #if GTK_CHECK_VERSION (3, 0, 0) - GdkRGBA color; - GtkStyleContext *style; + GtkStyleContext *context; #else GdkColor color; double r, g, b; GtkStyle *style; #endif +#if !GTK_CHECK_VERSION (3, 0, 0) _x0 += 0.5; _y0 += 0.5; +#endif height = round (height) - 1; width = round (width) - 1; x1 = round ((width - 1) * percentage); - #if GTK_CHECK_VERSION (3, 0, 0) - style = gtk_widget_get_style_context (GTK_WIDGET (window)); + context = gtk_widget_get_style_context (GTK_WIDGET (window)); #else style = gtk_widget_get_style (GTK_WIDGET (window)); #endif /* bar background */ - msd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, width, height); #if GTK_CHECK_VERSION (3, 0, 0) - mate_desktop_gtk_style_get_dark_color (style, GTK_STATE_FLAG_NORMAL, &color); - cairo_set_operator (cr, CAIRO_OPERATOR_DIFFERENCE); - cairo_set_source_rgba (cr, color.red, color.green, color.blue, MSD_OSD_WINDOW_FG_ALPHA / 2); + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_TROUGH); + + gtk_render_background (context, cr, _x0, _y0, width, height); + gtk_render_frame (context, cr, _x0, _y0, width, height); + + gtk_style_context_restore (context); + + /* bar progress */ + if (percentage < 0.01) + return; + + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_PROGRESSBAR); + + gtk_render_background (context, cr, _x0 + 0.5, _y0 + 0.5, x1, height -1 ); + gtk_render_frame (context, cr, _x0 + 0.5, _y0 + 0.5, x1, height -1 ); + + gtk_style_context_restore (context); #else msd_osd_window_color_reverse (&style->dark[GTK_STATE_NORMAL], &color); r = (float)color.red / 65535.0; @@ -441,41 +451,28 @@ draw_volume_boxes (MsdMediaKeysWindow *window, b = (float)color.blue / 65535.0; msd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, width, height); cairo_set_source_rgba (cr, r, g, b, MSD_OSD_WINDOW_FG_ALPHA / 2); -#endif cairo_fill_preserve (cr); /* bar border */ -#if GTK_CHECK_VERSION (3, 0, 0) - mate_desktop_gtk_style_get_light_color (style, GTK_STATE_FLAG_NORMAL, &color); - cairo_set_operator (cr, CAIRO_OPERATOR_DIFFERENCE); - cairo_set_source_rgba (cr, color.red, color.green, color.blue, MSD_OSD_WINDOW_FG_ALPHA / 2); -#else msd_osd_window_color_reverse (&style->light[GTK_STATE_NORMAL], &color); r = (float)color.red / 65535.0; g = (float)color.green / 65535.0; b = (float)color.blue / 65535.0; cairo_set_source_rgba (cr, r, g, b, MSD_OSD_WINDOW_FG_ALPHA / 2); -#endif cairo_set_line_width (cr, 1); cairo_stroke (cr); /* bar progress */ if (percentage < 0.01) return; - - msd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 6 - 0.5, x1, height - 1); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_COLOR, &color, NULL); - cairo_set_operator (cr, CAIRO_OPERATOR_DIFFERENCE); - cairo_set_source_rgba (cr, color.red, color.green, color.blue, MSD_OSD_WINDOW_FG_ALPHA); -#else color = style->bg[GTK_STATE_NORMAL]; r = (float)color.red / 65535.0; g = (float)color.green / 65535.0; b = (float)color.blue / 65535.0; + msd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 6 - 0.5, x1, height - 1); cairo_set_source_rgba (cr, r, g, b, MSD_OSD_WINDOW_FG_ALPHA); -#endif cairo_fill (cr); +#endif } static void @@ -521,6 +518,14 @@ draw_action_volume (MsdMediaKeysWindow *window, speaker_cx = icon_box_x0 + speaker_width / 2; speaker_cy = icon_box_y0 + speaker_height / 2; +#if 0 + g_message ("speaker box: w=%f h=%f cx=%f cy=%f", + speaker_width, + speaker_height, + speaker_cx, + speaker_cy); +#endif + /* draw speaker symbol */ draw_speaker (cr, speaker_cx, speaker_cy, speaker_width, speaker_height); @@ -622,6 +627,19 @@ draw_action_custom (MsdMediaKeysWindow *window, bright_box_x0 = round (icon_box_x0); bright_box_y0 = round (icon_box_height + icon_box_y0); +#if 0 + g_message ("icon box: w=%f h=%f _x0=%f _y0=%f", + icon_box_width, + icon_box_height, + icon_box_x0, + icon_box_y0); + g_message ("brightness box: w=%f h=%f _x0=%f _y0=%f", + bright_box_width, + bright_box_height, + bright_box_x0, + bright_box_y0); +#endif + res = render_custom (window, cr, icon_box_x0, icon_box_y0, |