[gnome-power-manager] Copy newer versions of osd window from gnome-settings-daemon
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager] Copy newer versions of osd window from gnome-settings-daemon
- Date: Wed, 26 Jan 2011 22:35:24 +0000 (UTC)
commit ffcad2d56fe1b68c938bcd4bc24d28f231884379
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jan 26 17:17:06 2011 -0500
Copy newer versions of osd window from gnome-settings-daemon
src/gsd-media-keys-window.c | 71 +++++------
src/gsd-osd-window.c | 292 +++++++++++++++++++++++++++++++++++--------
src/gsd-osd-window.h | 5 +-
3 files changed, 274 insertions(+), 94 deletions(-)
---
diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c
index 627c648..033e8d4 100644
--- a/src/gsd-media-keys-window.c
+++ b/src/gsd-media-keys-window.c
@@ -83,9 +83,9 @@ action_changed (GsdMediaKeysWindow *window)
volume_controls_set_visible (window, TRUE);
if (window->priv->volume_muted) {
- window_set_icon_name (window, "audio-volume-muted");
+ window_set_icon_name (window, "audio-volume-muted-symbolic");
} else {
- window_set_icon_name (window, "audio-volume-high");
+ window_set_icon_name (window, "audio-volume-high-symbolic");
}
break;
@@ -124,9 +124,9 @@ volume_muted_changed (GsdMediaKeysWindow *window)
if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
if (window->priv->volume_muted) {
- window_set_icon_name (window, "audio-volume-muted");
+ window_set_icon_name (window, "audio-volume-muted-symbolic");
} else {
- window_set_icon_name (window, "audio-volume-high");
+ window_set_icon_name (window, "audio-volume-high-symbolic");
}
}
}
@@ -208,7 +208,7 @@ load_pixbuf (GsdMediaKeysWindow *window,
pixbuf = gtk_icon_theme_load_icon (theme,
name,
icon_size,
- GTK_ICON_LOOKUP_FORCE_SIZE,
+ GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_GENERIC_FALLBACK,
NULL);
return pixbuf;
@@ -357,10 +357,10 @@ render_speaker (GsdMediaKeysWindow *window,
int icon_size;
int n;
static const char *icon_names[] = {
- "audio-volume-muted",
- "audio-volume-low",
- "audio-volume-medium",
- "audio-volume-high",
+ "audio-volume-muted-symbolic",
+ "audio-volume-low-symbolic",
+ "audio-volume-medium-symbolic",
+ "audio-volume-high-symbolic",
NULL
};
@@ -392,6 +392,9 @@ render_speaker (GsdMediaKeysWindow *window,
return TRUE;
}
+#define LIGHTNESS_MULT 1.3
+#define DARKNESS_MULT 0.7
+
static void
draw_volume_boxes (GsdMediaKeysWindow *window,
cairo_t *cr,
@@ -402,44 +405,41 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
double height)
{
gdouble x1;
- GdkColor color;
- double r, g, b;
- GtkStyle *style;
+ GtkStyleContext *context;
+ GdkRGBA acolor;
_x0 += 0.5;
_y0 += 0.5;
height = round (height) - 1;
width = round (width) - 1;
x1 = round ((width - 1) * percentage);
- style = gtk_widget_get_style (GTK_WIDGET (window));
+ context = gtk_widget_get_style_context (GTK_WIDGET (window));
/* bar background */
- gsd_osd_window_color_reverse (&style->dark[GTK_STATE_NORMAL], &color);
- r = (float)color.red / 65535.0;
- g = (float)color.green / 65535.0;
- b = (float)color.blue / 65535.0;
+ gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
+ gsd_osd_window_color_shade (&acolor, DARKNESS_MULT);
+ gsd_osd_window_color_reverse (&acolor);
+ acolor.alpha = GSD_OSD_WINDOW_FG_ALPHA / 2;
gsd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, width, height);
- cairo_set_source_rgba (cr, r, g, b, GSD_OSD_WINDOW_FG_ALPHA / 2);
+ gdk_cairo_set_source_rgba (cr, &acolor);
cairo_fill_preserve (cr);
/* bar border */
- gsd_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, GSD_OSD_WINDOW_FG_ALPHA / 2);
+ gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
+ gsd_osd_window_color_shade (&acolor, LIGHTNESS_MULT);
+ gsd_osd_window_color_reverse (&acolor);
+ acolor.alpha = GSD_OSD_WINDOW_FG_ALPHA / 2;
+ gdk_cairo_set_source_rgba (cr, &acolor);
cairo_set_line_width (cr, 1);
cairo_stroke (cr);
/* bar progress */
if (percentage < 0.01)
return;
- color = style->bg[GTK_STATE_NORMAL];
- r = (float)color.red / 65535.0;
- g = (float)color.green / 65535.0;
- b = (float)color.blue / 65535.0;
+ gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
+ acolor.alpha = GSD_OSD_WINDOW_FG_ALPHA;
gsd_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, GSD_OSD_WINDOW_FG_ALPHA);
+ gdk_cairo_set_source_rgba (cr, &acolor);
cairo_fill (cr);
}
@@ -467,9 +467,9 @@ draw_action_volume (GsdMediaKeysWindow *window,
volume_box_height = round (window_height * 0.05);
icon_box_x0 = (window_width - icon_box_width) / 2;
- icon_box_y0 = (window_height - icon_box_height - volume_box_height) / 2;
+ icon_box_y0 = (window_height - icon_box_height - volume_box_height) / 2 - volume_box_height;
volume_box_x0 = round (icon_box_x0);
- volume_box_y0 = round (icon_box_height + icon_box_y0);
+ volume_box_y0 = round (icon_box_height + icon_box_y0) + volume_box_height;
#if 0
g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
@@ -604,9 +604,9 @@ draw_action_custom (GsdMediaKeysWindow *window,
bright_box_height = round (window_height * 0.05);
icon_box_x0 = (window_width - icon_box_width) / 2;
- icon_box_y0 = (window_height - icon_box_height - bright_box_height) / 2;
+ icon_box_y0 = (window_height - icon_box_height - bright_box_height) / 2 - bright_box_height;
bright_box_x0 = round (icon_box_x0);
- bright_box_y0 = round (icon_box_height + icon_box_y0);
+ bright_box_y0 = round (icon_box_height + icon_box_y0) + bright_box_height;
#if 0
g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
@@ -625,7 +625,7 @@ draw_action_custom (GsdMediaKeysWindow *window,
cr,
icon_box_x0, icon_box_y0,
icon_box_width, icon_box_height);
- if (! res && g_strcmp0 (window->priv->icon_name, "media-eject") == 0) {
+ if (! res && g_str_has_prefix (window->priv->icon_name, "media-eject")) {
/* draw eject symbol */
draw_eject (cr,
icon_box_x0, icon_box_y0,
@@ -675,12 +675,8 @@ gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass)
static void
gsd_media_keys_window_init (GsdMediaKeysWindow *window)
{
- GdkScreen *screen;
-
window->priv = GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE (window);
- screen = gtk_widget_get_screen (GTK_WIDGET (window));
-
if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
GtkBuilder *builder;
const gchar *objects[] = {"acme_box", NULL};
@@ -693,6 +689,7 @@ gsd_media_keys_window_init (GsdMediaKeysWindow *window)
NULL);
window->priv->image = GTK_IMAGE (gtk_builder_get_object (builder, "acme_image"));
+ g_object_set (G_OBJECT (window->priv->image), "use-fallback", TRUE, NULL);
window->priv->progress = GTK_WIDGET (gtk_builder_get_object (builder, "acme_volume_progressbar"));
box = GTK_WIDGET (gtk_builder_get_object (builder, "acme_box"));
diff --git a/src/gsd-osd-window.c b/src/gsd-osd-window.c
index 24182ad..419e477 100644
--- a/src/gsd-osd-window.c
+++ b/src/gsd-osd-window.c
@@ -192,9 +192,192 @@ gsd_osd_window_draw_rounded_rectangle (cairo_t* cr,
cairo_close_path (cr);
}
+static void
+rgb_to_hls (gdouble *r,
+ gdouble *g,
+ gdouble *b)
+{
+ gdouble min;
+ gdouble max;
+ gdouble red;
+ gdouble green;
+ gdouble blue;
+ gdouble h, l, s;
+ gdouble delta;
+
+ red = *r;
+ green = *g;
+ blue = *b;
+
+ if (red > green)
+ {
+ if (red > blue)
+ max = red;
+ else
+ max = blue;
+
+ if (green < blue)
+ min = green;
+ else
+ min = blue;
+ }
+ else
+ {
+ if (green > blue)
+ max = green;
+ else
+ max = blue;
+
+ if (red < blue)
+ min = red;
+ else
+ min = blue;
+ }
+
+ l = (max + min) / 2;
+ s = 0;
+ h = 0;
+
+ if (max != min)
+ {
+ if (l <= 0.5)
+ s = (max - min) / (max + min);
+ else
+ s = (max - min) / (2 - max - min);
+
+ delta = max -min;
+ if (red == max)
+ h = (green - blue) / delta;
+ else if (green == max)
+ h = 2 + (blue - red) / delta;
+ else if (blue == max)
+ h = 4 + (red - green) / delta;
+
+ h *= 60;
+ if (h < 0.0)
+ h += 360;
+ }
+
+ *r = h;
+ *g = l;
+ *b = s;
+}
+
+static void
+hls_to_rgb (gdouble *h,
+ gdouble *l,
+ gdouble *s)
+{
+ gdouble hue;
+ gdouble lightness;
+ gdouble saturation;
+ gdouble m1, m2;
+ gdouble r, g, b;
+
+ lightness = *l;
+ saturation = *s;
+
+ if (lightness <= 0.5)
+ m2 = lightness * (1 + saturation);
+ else
+ m2 = lightness + saturation - lightness * saturation;
+ m1 = 2 * lightness - m2;
+
+ if (saturation == 0)
+ {
+ *h = lightness;
+ *l = lightness;
+ *s = lightness;
+ }
+ else
+ {
+ hue = *h + 120;
+ while (hue > 360)
+ hue -= 360;
+ while (hue < 0)
+ hue += 360;
+
+ if (hue < 60)
+ r = m1 + (m2 - m1) * hue / 60;
+ else if (hue < 180)
+ r = m2;
+ else if (hue < 240)
+ r = m1 + (m2 - m1) * (240 - hue) / 60;
+ else
+ r = m1;
+
+ hue = *h;
+ while (hue > 360)
+ hue -= 360;
+ while (hue < 0)
+ hue += 360;
+
+ if (hue < 60)
+ g = m1 + (m2 - m1) * hue / 60;
+ else if (hue < 180)
+ g = m2;
+ else if (hue < 240)
+ g = m1 + (m2 - m1) * (240 - hue) / 60;
+ else
+ g = m1;
+
+ hue = *h - 120;
+ while (hue > 360)
+ hue -= 360;
+ while (hue < 0)
+ hue += 360;
+
+ if (hue < 60)
+ b = m1 + (m2 - m1) * hue / 60;
+ else if (hue < 180)
+ b = m2;
+ else if (hue < 240)
+ b = m1 + (m2 - m1) * (240 - hue) / 60;
+ else
+ b = m1;
+
+ *h = r;
+ *l = g;
+ *s = b;
+ }
+}
+
+void
+gsd_osd_window_color_shade (GdkRGBA *a,
+ gdouble k)
+{
+ gdouble red;
+ gdouble green;
+ gdouble blue;
+
+ red = a->red;
+ green = a->green;
+ blue = a->blue;
+
+ rgb_to_hls (&red, &green, &blue);
+
+ green *= k;
+ if (green > 1.0)
+ green = 1.0;
+ else if (green < 0.0)
+ green = 0.0;
+
+ blue *= k;
+ if (blue > 1.0)
+ blue = 1.0;
+ else if (blue < 0.0)
+ blue = 0.0;
+
+ hls_to_rgb (&red, &green, &blue);
+
+ a->red = red;
+ a->green = green;
+ a->blue = blue;
+}
+
+
void
-gsd_osd_window_color_reverse (const GdkColor *a,
- GdkColor *b)
+gsd_osd_window_color_reverse (GdkRGBA *a)
{
gdouble red;
gdouble green;
@@ -203,9 +386,9 @@ gsd_osd_window_color_reverse (const GdkColor *a,
gdouble s;
gdouble v;
- red = (gdouble) a->red / 65535.0;
- green = (gdouble) a->green / 65535.0;
- blue = (gdouble) a->blue / 65535.0;
+ red = a->red;
+ green = a->green;
+ blue = a->blue;
gtk_rgb_to_hsv (red, green, blue, &h, &s, &v);
@@ -217,9 +400,9 @@ gsd_osd_window_color_reverse (const GdkColor *a,
gtk_hsv_to_rgb (h, s, v, &red, &green, &blue);
- b->red = red * 65535.0;
- b->green = green * 65535.0;
- b->blue = blue * 65535.0;
+ a->red = red;
+ a->green = green;
+ a->blue = blue;
}
/* This is our draw handler when the window is in a compositing manager.
@@ -227,24 +410,23 @@ gsd_osd_window_color_reverse (const GdkColor *a,
* transparent/rounded look.
*/
static void
-draw_when_composited (GtkWidget *widget, cairo_t *context)
+draw_when_composited (GtkWidget *widget, cairo_t *orig_cr)
{
GsdOsdWindow *window;
cairo_t *cr;
cairo_surface_t *surface;
int width;
int height;
- GtkStyle *style;
- GdkColor color;
- double r, g, b;
+ GtkStyleContext *context;
+ GdkRGBA acolor;
window = GSD_OSD_WINDOW (widget);
- style = gtk_widget_get_style (widget);
- cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
+ context = gtk_widget_get_style_context (widget);
+ cairo_set_operator (orig_cr, CAIRO_OPERATOR_SOURCE);
gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
- surface = cairo_surface_create_similar (cairo_get_target (context),
+ surface = cairo_surface_create_similar (cairo_get_target (orig_cr),
CAIRO_CONTENT_COLOR_ALPHA,
width,
height);
@@ -263,18 +445,17 @@ draw_when_composited (GtkWidget *widget, cairo_t *context)
/* draw a box */
gsd_osd_window_draw_rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
- gsd_osd_window_color_reverse (&style->bg[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, BG_ALPHA);
+ gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
+ gsd_osd_window_color_reverse (&acolor);
+ acolor.alpha = BG_ALPHA;
+ gdk_cairo_set_source_rgba (cr, &acolor);
cairo_fill_preserve (cr);
- gsd_osd_window_color_reverse (&style->text_aa[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, BG_ALPHA / 2);
+ /* FIXME use &style->text_aa[GTK_STATE_NORMAL] instead? */
+ gtk_style_context_get_color (context, GTK_STATE_NORMAL, &acolor);
+ gsd_osd_window_color_reverse (&acolor);
+ acolor.alpha = BG_ALPHA / 2;
+ gdk_cairo_set_source_rgba (cr, &acolor);
cairo_set_line_width (cr, 1);
cairo_stroke (cr);
@@ -283,12 +464,12 @@ draw_when_composited (GtkWidget *widget, cairo_t *context)
cairo_destroy (cr);
/* Make sure we have a transparent background */
- cairo_rectangle (context, 0, 0, width, height);
- cairo_set_source_rgba (context, 0.0, 0.0, 0.0, 0.0);
- cairo_fill (context);
+ cairo_rectangle (orig_cr, 0, 0, width, height);
+ cairo_set_source_rgba (orig_cr, 0.0, 0.0, 0.0, 0.0);
+ cairo_fill (orig_cr);
- cairo_set_source_surface (context, surface, 0, 0);
- cairo_paint_with_alpha (context, window->priv->fade_out_alpha);
+ cairo_set_source_surface (orig_cr, surface, 0, 0);
+ cairo_paint_with_alpha (orig_cr, window->priv->fade_out_alpha);
done:
if (surface != NULL) {
@@ -305,21 +486,17 @@ draw_when_composited (GtkWidget *widget, cairo_t *context)
static void
draw_when_not_composited (GtkWidget *widget, cairo_t *cr)
{
- GsdOsdWindow *window;
+ GtkStyleContext *context;
int width;
int height;
- window = GSD_OSD_WINDOW (widget);
-
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_width (widget);
+ context = gtk_widget_get_style_context (widget);
- gtk_paint_shadow (gtk_widget_get_style (widget),
+ gtk_style_context_set_state (context, GTK_STATE_FLAG_ACTIVE);
+ gtk_render_frame (context,
cr,
- gtk_widget_get_state (widget),
- GTK_SHADOW_OUT,
- widget,
- NULL, /* NULL detail -> themes should use the GsdOsdWindow widget name, probably */
0,
0,
width,
@@ -400,20 +577,21 @@ gsd_osd_window_real_realize (GtkWidget *widget)
}
static void
-gsd_osd_window_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+gsd_osd_window_style_updated (GtkWidget *widget)
{
- GtkStyle *style;
+ GtkStyleContext *context;
+ GtkBorder padding;
- GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->style_set (widget, previous_style);
+ GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->style_updated (widget);
/* We set our border width to 12 (per the GNOME standard), plus the
* thickness of the frame that we draw in our draw handler. This will
* make our child be 12 pixels away from the frame.
*/
- style = gtk_widget_get_style (widget);
- gtk_container_set_border_width (GTK_CONTAINER (widget), 12 + MAX (style->xthickness, style->ythickness));
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get_padding (context, GTK_STATE_NORMAL, &padding);
+ gtk_container_set_border_width (GTK_CONTAINER (widget), 12 + MAX (padding.left, padding.top));
}
static void
@@ -421,16 +599,18 @@ gsd_osd_window_get_preferred_width (GtkWidget *widget,
gint *minimum,
gint *natural)
{
- GtkStyle *style;
+ GtkStyleContext *context;
+ GtkBorder padding;
GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->get_preferred_width (widget, minimum, natural);
- /* See the comment in gsd_osd_window_style_set() for why we add the thickness here */
+ /* See the comment in gsd_osd_window_style_updated() for why we add the padding here */
- style = gtk_widget_get_style (widget);
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get_padding (context, GTK_STATE_NORMAL, &padding);
- *minimum += style->xthickness;
- *natural += style->xthickness;
+ *minimum += padding.left;
+ *natural += padding.left;
}
static void
@@ -438,16 +618,18 @@ gsd_osd_window_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural)
{
- GtkStyle *style;
+ GtkStyleContext *context;
+ GtkBorder padding;
GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->get_preferred_height (widget, minimum, natural);
- /* See the comment in gsd_osd_window_style_set() for why we add the thickness here */
+ /* See the comment in gsd_osd_window_style_updated() for why we add the padding here */
- style = gtk_widget_get_style (widget);
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get_padding (context, GTK_STATE_NORMAL, &padding);
- *minimum += style->ythickness;
- *natural += style->ythickness;
+ *minimum += padding.top;
+ *natural += padding.top;
}
static GObject *
@@ -481,7 +663,7 @@ gsd_osd_window_class_init (GsdOsdWindowClass *klass)
widget_class->show = gsd_osd_window_real_show;
widget_class->hide = gsd_osd_window_real_hide;
widget_class->realize = gsd_osd_window_real_realize;
- widget_class->style_set = gsd_osd_window_style_set;
+ widget_class->style_updated = gsd_osd_window_style_updated;
widget_class->get_preferred_width = gsd_osd_window_get_preferred_width;
widget_class->get_preferred_height = gsd_osd_window_get_preferred_height;
widget_class->draw = gsd_osd_window_draw;
diff --git a/src/gsd-osd-window.h b/src/gsd-osd-window.h
index 1cdab4c..18ceb24 100644
--- a/src/gsd-osd-window.h
+++ b/src/gsd-osd-window.h
@@ -86,8 +86,9 @@ void gsd_osd_window_draw_rounded_rectangle (cairo_t *cr,
gdouble width,
gdouble height);
-void gsd_osd_window_color_reverse (const GdkColor *a,
- GdkColor *b);
+void gsd_osd_window_color_reverse (GdkRGBA *a);
+void gsd_osd_window_color_shade (GdkRGBA *a,
+ gdouble k);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
