callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't let themes override explicit border-width in dialogs"

Browse Source 
This reverts commit 6e4567e73b.

For some reason, this causes buttons in message dialogs to have an
unwanted border.
This commit is contained in:
Matthias Clasen 2014-03-24 08:35:27 -04:00
parent 329263f091
commit 7da97a3642
3 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkcontainer.c
View File

@ -247,7 +247,6 @@ struct _GtkContainerPrivate
guint resize_handler; guint resize_handler;
guint border_width : 16; guint border_width : 16;
guint border_width_set : 1;
guint has_focus_chain : 1; guint has_focus_chain : 1;
guint reallocate_redraws : 1; guint reallocate_redraws : 1;
@ -1382,7 +1381,6 @@ gtk_container_init (GtkContainer *container)
priv->border_width = 0; priv->border_width = 0;
priv->resize_mode = GTK_RESIZE_PARENT; priv->resize_mode = GTK_RESIZE_PARENT;
priv->reallocate_redraws = FALSE; priv->reallocate_redraws = FALSE;
priv->border_width_set = FALSE;
} }
static void static void
@ -1464,31 +1462,6 @@ gtk_container_get_property (GObject *object,
} }
} }
gboolean
_gtk_container_get_border_width_set (GtkContainer *container)
{
GtkContainerPrivate *priv;
g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
priv = container->priv;
return priv->border_width_set;
}
void
_gtk_container_set_border_width_set (GtkContainer *container,
gboolean border_width_set)
{
GtkContainerPrivate *priv;
g_return_if_fail (GTK_IS_CONTAINER (container));
priv = container->priv;
priv->border_width_set = border_width_set ? TRUE : FALSE;
}
/** /**
* gtk_container_set_border_width: * gtk_container_set_border_width:
* @container: a #GtkContainer * @container: a #GtkContainer
@ -1519,8 +1492,6 @@ gtk_container_set_border_width (GtkContainer *container,
if (priv->border_width != border_width) if (priv->border_width != border_width)
{ {
priv->border_width = border_width; priv->border_width = border_width;
_gtk_container_set_border_width_set (container, TRUE);
g_object_notify (G_OBJECT (container), "border-width"); g_object_notify (G_OBJECT (container), "border-width");
if (gtk_widget_get_realized (GTK_WIDGET (container))) if (gtk_widget_get_realized (GTK_WIDGET (container)))

3
gtk/gtkcontainerprivate.h
View File

@ -41,9 +41,6 @@ gboolean _gtk_container_get_reallocate_redraws (GtkContainer *container);
void _gtk_container_stop_idle_sizer (GtkContainer *container); void _gtk_container_stop_idle_sizer (GtkContainer *container);
void _gtk_container_maybe_start_idle_sizer (GtkContainer *container); void _gtk_container_maybe_start_idle_sizer (GtkContainer *container);
gboolean _gtk_container_get_border_width_set (GtkContainer *container);
void _gtk_container_set_border_width_set (GtkContainer *container,
gboolean border_width_set);
G_END_DECLS G_END_DECLS

22
gtk/gtkdialog.c
View File

@ -35,7 +35,6 @@
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkboxprivate.h" #include "gtkboxprivate.h"
#include "gtkcontainerprivate.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbindings.h" #include "gtkbindings.h"
@ -567,15 +566,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/**
* GtkDialog:content-area-border:
*
* The default border width used around the
* content area of the dialog, as returned by
* gtk_dialog_get_content_area(), unless gtk_container_set_border_width()
* was called on that widget directly.
*
*/
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("content-area-border", g_param_spec_int ("content-area-border",
P_("Content area border"), P_("Content area border"),
@ -667,10 +657,8 @@ update_spacings (GtkDialog *dialog)
"action-area-border", &action_area_border, "action-area-border", &action_area_border,
NULL); NULL);
if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->vbox))) gtk_container_set_border_width (GTK_CONTAINER (priv->vbox),
gtk_container_set_border_width (GTK_CONTAINER (priv->vbox), content_area_border);
content_area_border);
if (!_gtk_box_get_spacing_set (GTK_BOX (priv->vbox))) if (!_gtk_box_get_spacing_set (GTK_BOX (priv->vbox)))
{ {
gtk_box_set_spacing (GTK_BOX (priv->vbox), content_area_spacing); gtk_box_set_spacing (GTK_BOX (priv->vbox), content_area_spacing);
@ -679,10 +667,8 @@ update_spacings (GtkDialog *dialog)
gtk_box_set_spacing (GTK_BOX (priv->action_area), gtk_box_set_spacing (GTK_BOX (priv->action_area),
button_spacing); button_spacing);
gtk_container_set_border_width (GTK_CONTAINER (priv->action_area),
if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->action_area))) action_area_border);
gtk_container_set_border_width (GTK_CONTAINER (priv->action_area),
action_area_border);
} }
static void static void