summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Swain <robert.swain@collabora.co.uk>2011-05-20 09:18:54 +0200
committerRobert Swain <robert.swain@collabora.co.uk>2011-05-20 09:18:54 +0200
commite518ed6f83799afeb57935a909b6ffecffc75bb3 (patch)
treedc6b4fa293c3f2358288569e2d1d025eecd38f6e
parentb37355895e9af77836ca0da8c0790b32717ff9c5 (diff)
ui: Fix progress bar height
Various code was using seek_{width,height} to adjust the size of the progress/seek bar which was being set to the height including the border.
-rw-r--r--src/user_interface.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/user_interface.c b/src/user_interface.c
index ce0bcd4..1673a0a 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -792,15 +792,15 @@ update_controls_size (UserInterface * ui)
clutter_text_set_font_name (CLUTTER_TEXT (ui->control_title), font_name);
text_width = clutter_actor_get_width (CLUTTER_ACTOR (ui->control_title));
- ui->seek_width = (ctl_width * MAIN_BOX_W - icon_size) * SEEK_WIDTH_RATIO;
- ui->seek_height = ctl_height * MAIN_BOX_H * SEEK_HEIGHT_RATIO;
+ ui->seek_width = (ctl_width * MAIN_BOX_W - icon_size) * SEEK_WIDTH_RATIO - 2.0f * SEEK_BORDER;
+ ui->seek_height = ctl_height * MAIN_BOX_H * SEEK_HEIGHT_RATIO - 2.0f * SEEK_BORDER;
- clutter_actor_set_size (ui->control_seek1, ui->seek_width, ui->seek_height);
+ clutter_actor_set_size (ui->control_seek1,
+ ui->seek_width + 2.0f * SEEK_BORDER,
+ ui->seek_height + 2.0f * SEEK_BORDER);
clutter_actor_set_position (ui->control_seek1, 0, 0);
- clutter_actor_set_size (ui->control_seek2,
- ui->seek_width - 2.0f * SEEK_BORDER,
- ui->seek_height - 2.0f * SEEK_BORDER);
+ clutter_actor_set_size (ui->control_seek2, ui->seek_width, ui->seek_height);
clutter_actor_set_position (ui->control_seek2, SEEK_BORDER, SEEK_BORDER);
progress_update_seekbar (ui);