[gtk+/client-side-decorations] Remove xthickness from child_allocation.y to fix an unwanted line between the titlebar and content.
- From: Cody Russell <bratsche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/client-side-decorations] Remove xthickness from child_allocation.y to fix an unwanted line between the titlebar and content.
- Date: Thu, 20 May 2010 20:17:03 +0000 (UTC)
commit 7191af3f9d4d8416f7fec28d5118b56c93b715de
Author: Cody Russell <bratsche gnome org>
Date: Wed May 19 18:49:23 2010 -0500
Remove xthickness from child_allocation.y to fix an unwanted line between the titlebar and content.
gtk/gtkwindow.c | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index d404cea..2b6d087 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -989,22 +989,6 @@ gtk_window_class_init (GtkWindowClass *klass)
5.0, GTK_PARAM_READWRITE));
/**
- * GtkWindow:client-side-drop-shadows:
- *
- * Indicates that GTK+ should render drop-shadows to the window frame.
- * This is ignored if the #GtkWindow:client-side-decorated style property is not
- * set to %TRUE.
- *
- * Since: 2.20
- */
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_boolean ("client-side-drop-shadows",
- P_("Client-side drop shadows"),
- P_("Whether to draw client-side drop shadows"),
- FALSE,
- GTK_PARAM_READWRITE));
-
- /**
* GtkWindow:extents-left:
*
* Specifies the size of the client-side window extents on the left edge of
@@ -5569,6 +5553,12 @@ is_client_side_decorated (GtkWindow *window)
return FALSE;
}
+ if (gtk_widget_get_realized (GTK_WIDGET (window)))
+ {
+ if (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN)
+ return FALSE;
+ }
+
gtk_widget_style_get (GTK_WIDGET (window),
"client-side-decorated", &client_side_decorated,
NULL);
@@ -5951,7 +5941,6 @@ gtk_window_size_allocate (GtkWidget *widget,
GtkRequisition deco_requisition;
GtkAllocation deco_allocation;
GtkRequisition primary_requisition;
- // GtkAllocation primary_allocation;
GtkRequisition box_requisition;
GtkAllocation box_allocation;
gint frame_width = 0;
@@ -6077,7 +6066,6 @@ gtk_window_size_allocate (GtkWidget *widget,
+ MAX (deco_allocation.height, box_allocation.height)
+ upper_padding
+ lower_padding
- + widget->style->xthickness
+ frame_width; // XXX - padding style property?
child_allocation.width = MAX (1, ((gint)allocation->width - container->border_width * 2
- extents_left - extents_right
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]