- Update from F-12 branch

This commit is contained in:
Bastien Nocera 2009-10-28 10:28:53 +00:00
parent 6e50c9153d
commit 8f21a50ec0

View File

@ -1,14 +1,15 @@
From 26041c5b936263d3f5aa4aa7fc7ffedd128ed444 Mon Sep 17 00:00:00 2001
From 20036534e2828417b75ea3a0cd830266f40f81f6 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Wed, 23 Sep 2009 21:15:45 -0400
Subject: [PATCH 3/3] Improve the media keys overlay design
Subject: [PATCH 3/5] Improve the media keys overlay design
https://bugzilla.gnome.org/show_bug.cgi?id=596136
---
plugins/media-keys/gsd-media-keys-window.c | 59 +++++++++++++++++++++-------
1 files changed, 45 insertions(+), 14 deletions(-)
plugins/media-keys/gsd-media-keys-window.c | 57 +++++++++++++++++++++------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index cffbe3e..c33d624 100644
index cffbe3e..ec69598 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -33,7 +33,7 @@
@ -57,12 +58,8 @@ index cffbe3e..c33d624 100644
draw_volume_boxes (GsdMediaKeysWindow *window,
cairo_t *cr,
double percentage,
@@ -609,33 +639,34 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
y0 += 0.5;
height = round (height) - 1;
width = round (width) - 1;
- x1 = round ((width - 1) * percentage);
+ x1 = round ((width - 2) * percentage);
@@ -612,30 +642,31 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
x1 = round ((width - 1) * percentage);
/* bar background */
- color = GTK_WIDGET (window)->style->dark [GTK_STATE_NORMAL];
@ -98,7 +95,7 @@ index cffbe3e..c33d624 100644
g = (float)color.green / 65535.0;
b = (float)color.blue / 65535.0;
- cairo_rectangle (cr, x0 + 0.5, y0 + 0.5, x1, height - 1);
+ rounded_rectangle (cr, 1.0, x0 + 0.5, y0 + 0.5, height / 8, x1, height - 2);
+ 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, FG_ALPHA);
cairo_fill (cr);
}