aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-08-25 18:15:56 +0100
committerConor Curran <conor.curran@canonical.com>2010-08-25 18:15:56 +0100
commit254525b58e75739e8739cc1e13681a38b4beb615 (patch)
treed0dc03d4c08acc3b6f8b34cfe9ba88fb454d9de9
parent0cfad99ce347f365d52783a2f3543b25acc94706 (diff)
downloadayatana-indicator-sound-254525b58e75739e8739cc1e13681a38b4beb615.tar.gz
ayatana-indicator-sound-254525b58e75739e8739cc1e13681a38b4beb615.tar.bz2
ayatana-indicator-sound-254525b58e75739e8739cc1e13681a38b4beb615.zip
more tweaks
-rw-r--r--src/metadata-widget.c14
-rw-r--r--src/play-button.c64
-rw-r--r--src/title-widget.c2
3 files changed, 34 insertions, 46 deletions
diff --git a/src/metadata-widget.c b/src/metadata-widget.c
index 8aeb862..fae3198 100644
--- a/src/metadata-widget.c
+++ b/src/metadata-widget.c
@@ -318,24 +318,12 @@ static void
metadata_widget_style_labels(MetadataWidget* self, GtkLabel* label)
{
char* markup;
- markup = g_markup_printf_escaped ("<span size=\"small\">%s</span>",
+ markup = g_markup_printf_escaped ("<span size=\"smaller\">%s</span>",
gtk_label_get_text(GTK_LABEL(label)));
gtk_label_set_markup (GTK_LABEL (label), markup);
g_free(markup);
}
-static void
-metadata_widget_style_title_text(MetadataWidget* self)
-{
- MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(self);
-
- char* markup;
- markup = g_markup_printf_escaped ("<span weight=\"bold\" size=\"small\">%s</span>",
- gtk_label_get_text(GTK_LABEL(priv->piece_label)));
- gtk_label_set_markup (GTK_LABEL (priv->piece_label), markup);
- g_free(markup);
-}
-
void
metadata_widget_set_style(GtkWidget* metadata, GtkStyle* style)
{
diff --git a/src/play-button.c b/src/play-button.c
index 2f3a553..a2eaf2e 100644
--- a/src/play-button.c
+++ b/src/play-button.c
@@ -750,9 +750,9 @@ draw (GtkWidget* button, cairo_t *cr)
X,
Y + 2,
RECT_WIDTH - 4,
- INNER_RADIUS,
- INNER_START,
- INNER_END);
+ MIDDLE_RADIUS,
+ MIDDLE_START,
+ MIDDLE_END);
if(priv->current_command == TRANSPORT_PREVIOUS){
draw_gradient (cr,
@@ -774,35 +774,35 @@ draw (GtkWidget* button, cairo_t *cr)
}
// play/pause-background
- draw_circle (cr,
- X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f,
- Y - ((CIRCLE_RADIUS - OUTER_RADIUS)),
- CIRCLE_RADIUS,
- OUTER_START,
- OUTER_END);
- draw_circle (cr,
- X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 0.5f,
- Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 0.5f,
- CIRCLE_RADIUS - 0.75f,
- MIDDLE_START,
- MIDDLE_END);
-
- if(priv->current_command == TRANSPORT_PLAY_PAUSE){
- draw_circle (cr,
- X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 1.5f,
- Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 1.5f,
- CIRCLE_RADIUS - 1.5f,
- INNER_COMPRESSED_START,
- INNER_COMPRESSED_END);
- }
- else{
- draw_circle (cr,
- X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 1.5f,
- Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 1.5f,
- CIRCLE_RADIUS - 1.5f,
- INNER_START,
- INNER_END);
- }
+ draw_circle (cr,
+ X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f,
+ Y - ((CIRCLE_RADIUS - OUTER_RADIUS)),
+ CIRCLE_RADIUS,
+ OUTER_START,
+ OUTER_END);
+ draw_circle (cr,
+ X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 0.5f,
+ Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 0.5f,
+ CIRCLE_RADIUS - 0.75f,
+ MIDDLE_START,
+ MIDDLE_END);
+
+ if(priv->current_command == TRANSPORT_PLAY_PAUSE){
+ draw_circle (cr,
+ X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 1.5f,
+ Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 1.5f,
+ CIRCLE_RADIUS - 1.5f,
+ INNER_COMPRESSED_START,
+ INNER_COMPRESSED_END);
+ }
+ else{
+ draw_circle (cr,
+ X + RECT_WIDTH / 2.0f - 2.0f * OUTER_RADIUS - 5.5f + 1.5f,
+ Y - ((CIRCLE_RADIUS - OUTER_RADIUS)) + 1.5f,
+ CIRCLE_RADIUS - 1.5f,
+ MIDDLE_START,
+ MIDDLE_END);
+ }
// draw previous-button drop-shadow
_setup (&cr_surf, &surf, PREV_WIDTH, PREV_HEIGHT);
_mask_prev (cr_surf,
diff --git a/src/title-widget.c b/src/title-widget.c
index b5ed3c0..e9f34d6 100644
--- a/src/title-widget.c
+++ b/src/title-widget.c
@@ -160,7 +160,7 @@ title_widget_style_name_text(TitleWidget* self)
TitleWidgetPrivate * priv = TITLE_WIDGET_GET_PRIVATE(self);
char* markup;
- markup = g_markup_printf_escaped ("<span size=\"larger\">%s</span>",
+ markup = g_markup_printf_escaped ("<span size=\"medium\">%s</span>",
gtk_label_get_text(GTK_LABEL(priv->name)));
gtk_label_set_markup (GTK_LABEL (priv->name), markup);
g_free(markup);