summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2010-04-27 18:04:32 +0100
committerBastien Nocera <hadess@hadess.net>2010-04-27 18:07:35 +0100
commit4fd29a1dbc368fd993b55a885ff8b55d0bbdfd76 (patch)
tree9c2bdf0a82693005cbfff87a4b8899fa901615da
parent03d9c44cc1a839f56063cb1e724005a0c59f7236 (diff)
downloadtotem-4fd29a1dbc368fd993b55a885ff8b55d0bbdfd76.tar.gz
Really remove the border width
-rw-r--r--src/totem-object.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/totem-object.c b/src/totem-object.c
index 0a2e7e63a..c6b5a40ad 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -90,8 +90,6 @@
#define VOLUME_EPSILON (1e-10)
-#define BVW_VBOX_BORDER_WIDTH 1
-
/* casts are to shut gcc up */
static const GtkTargetEntry target_table[] = {
{ (gchar*) "text/uri-list", 0, 0 },
@@ -2820,7 +2818,7 @@ show_controls (Totem *totem, gboolean was_fullscreen)
if (totem->controls_visibility == TOTEM_CONTROLS_VISIBLE) {
if (was_fullscreen == FALSE) {
height = allocation.height;
- width = allocation.width;
+ width = allocation.width;
}
gtk_widget_set_sensitive (menubar, TRUE);
@@ -2844,7 +2842,7 @@ show_controls (Totem *totem, gboolean was_fullscreen)
&value);
handle_size = g_value_get_int (&value);
g_value_unset (&value);
-
+
gtk_widget_show (totem->sidebar);
gtk_widget_get_allocation (totem->sidebar, &allocation_sidebar);
width += allocation_sidebar.width + handle_size;
@@ -2852,9 +2850,6 @@ show_controls (Totem *totem, gboolean was_fullscreen)
gtk_widget_hide (totem->sidebar);
}
- gtk_container_set_border_width (GTK_CONTAINER (bvw_box),
- BVW_VBOX_BORDER_WIDTH);
-
if (was_fullscreen == FALSE) {
GtkAllocation allocation_menubar;
GtkAllocation allocation_controlbar;
@@ -2865,9 +2860,7 @@ show_controls (Totem *totem, gboolean was_fullscreen)
gtk_widget_get_allocation (statusbar, &allocation_statusbar);
height += allocation_menubar.height
+ allocation_controls.height
- + allocation_statusbar.height
- + 2 * BVW_VBOX_BORDER_WIDTH;
- width += 2 * BVW_VBOX_BORDER_WIDTH;
+ + allocation_statusbar.height;
gtk_window_resize (GTK_WINDOW(totem->win),
width, height);
}