diff options
Diffstat (limited to 'gtk')
61 files changed, 95 insertions, 724 deletions
diff --git a/gtk/deprecated/gtkalignment.c b/gtk/deprecated/gtkalignment.c index eaf7f2bd4c..8c5913e175 100644 --- a/gtk/deprecated/gtkalignment.c +++ b/gtk/deprecated/gtkalignment.c @@ -556,7 +556,6 @@ gtk_alignment_size_allocate (GtkWidget *widget, GtkAllocation child_allocation; GtkWidget *child; gint width, height; - gint border_width; gint baseline; gtk_widget_set_allocation (widget, allocation); @@ -571,17 +570,15 @@ gtk_alignment_size_allocate (GtkWidget *widget, gint child_width, child_height; double yalign, yscale; - border_width = gtk_container_get_border_width (GTK_CONTAINER (alignment)); - padding_horizontal = priv->padding_left + priv->padding_right; padding_vertical = priv->padding_top + priv->padding_bottom; - width = MAX (1, allocation->width - padding_horizontal - 2 * border_width); - height = MAX (1, allocation->height - padding_vertical - 2 * border_width); + width = MAX (1, allocation->width - padding_horizontal); + height = MAX (1, allocation->height - padding_vertical); baseline = gtk_widget_get_allocated_baseline (widget); if (baseline != -1) - baseline -= border_width + priv->padding_top; + baseline -= priv->padding_top; /* If we get a baseline set that means we're baseline aligned, and the parent honored that. In that case we have to ignore yalign/yscale as we need @@ -634,11 +631,11 @@ gtk_alignment_size_allocate (GtkWidget *widget, child_allocation.height = height; if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) - child_allocation.x = (1.0 - priv->xalign) * (width - child_allocation.width) + allocation->x + border_width + priv->padding_right; + child_allocation.x = (1.0 - priv->xalign) * (width - child_allocation.width) + allocation->x + priv->padding_right; else - child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + border_width + priv->padding_left; + child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + priv->padding_left; - child_allocation.y = yalign * (height - child_allocation.height) + allocation->y + border_width + priv->padding_top; + child_allocation.y = yalign * (height - child_allocation.height) + allocation->y + priv->padding_top; gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline); } @@ -659,16 +656,14 @@ gtk_alignment_get_preferred_size (GtkWidget *widget, GtkWidget *child; guint minimum, natural; guint top_offset; - guint border; if (minimum_baseline) *minimum_baseline = -1; if (natural_baseline) *natural_baseline = -1; - border = gtk_container_get_border_width (GTK_CONTAINER (widget)); - natural = minimum = border * 2; - top_offset = border; + natural = minimum = 0; + top_offset = 0; if ((child = gtk_bin_get_child (GTK_BIN (widget))) && gtk_widget_get_visible (child)) { diff --git a/gtk/deprecated/gtktable.c b/gtk/deprecated/gtktable.c index b51f869327..a10e893abf 100644 --- a/gtk/deprecated/gtktable.c +++ b/gtk/deprecated/gtktable.c @@ -177,7 +177,6 @@ gtk_table_class_init (GtkTableClass *class) container_class->child_type = gtk_table_child_type; container_class->set_child_property = gtk_table_set_child_property; container_class->get_child_property = gtk_table_get_child_property; - gtk_container_class_handle_border_width (container_class); g_object_class_install_property (gobject_class, PROP_N_ROWS, diff --git a/gtk/gtk-builder-tool.c b/gtk/gtk-builder-tool.c index cb5e8643c2..28e44547d0 100644 --- a/gtk/gtk-builder-tool.c +++ b/gtk/gtk-builder-tool.c @@ -186,14 +186,12 @@ needs_explicit_setting (MyParserData *data, { "GtkCalendar", "year", 0 }, { "GtkCalendar", "month", 0 }, { "GtkCalendar", "day", 0 }, - { "GtkDialog", "border-width", 0 }, { "GtkPlacesSidebar", "show-desktop", 0 }, { "GtkRadioButton", "draw-indicator", 0 }, { "GtkGrid", "left-attach", 1 }, { "GtkGrid", "top-attach", 1 }, { "GtkWidget", "hexpand", 0 }, { "GtkWidget", "vexpand", 0 }, - { "GtkContainer", "border-width", 0 }, { "GtkVBox", "expand", 1 }, { NULL, NULL, 0 } }; diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index 1694547e98..556525d121 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -522,45 +522,6 @@ gtk_app_chooser_dialog_constructed (GObject *object) setup_search (self); } -/* This is necessary do deal with the fact that GtkDialog - * exposes bits of its internal spacing as style properties, - * and puts the action area inside the content area. - * To achieve a flush-top search bar, we need the content - * area border to be 0, and distribute the spacing to other - * containers to compensate. - */ -static void -update_spacings (GtkAppChooserDialog *self) -{ - GtkWidget *widget; - gint content_area_border; - gint action_area_border; - - gtk_widget_style_get (GTK_WIDGET (self), - "content-area-border", &content_area_border, - "action-area-border", &action_area_border, - NULL); - - widget = gtk_dialog_get_content_area (GTK_DIALOG (self)); - gtk_container_set_border_width (GTK_CONTAINER (widget), 0); - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - widget = gtk_dialog_get_action_area (GTK_DIALOG (self)); -G_GNUC_END_IGNORE_DEPRECATIONS - gtk_container_set_border_width (GTK_CONTAINER (widget), 5 + content_area_border + action_area_border); - - widget = self->priv->inner_box; - gtk_container_set_border_width (GTK_CONTAINER (widget), 10 + content_area_border); -} - -static void -gtk_app_chooser_dialog_style_updated (GtkWidget *widget) -{ - GTK_WIDGET_CLASS (gtk_app_chooser_dialog_parent_class)->style_updated (widget); - - update_spacings (GTK_APP_CHOOSER_DIALOG (widget)); -} - static void gtk_app_chooser_dialog_dispose (GObject *object) { @@ -646,20 +607,19 @@ gtk_app_chooser_dialog_iface_init (GtkAppChooserIface *iface) static void gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass) { - GtkWidgetClass *widget_class; GObjectClass *gobject_class; + GtkWidgetClass *widget_class; GParamSpec *pspec; gobject_class = G_OBJECT_CLASS (klass); + widget_class = GTK_WIDGET_CLASS (klass); + gobject_class->dispose = gtk_app_chooser_dialog_dispose; gobject_class->finalize = gtk_app_chooser_dialog_finalize; gobject_class->set_property = gtk_app_chooser_dialog_set_property; gobject_class->get_property = gtk_app_chooser_dialog_get_property; gobject_class->constructed = gtk_app_chooser_dialog_constructed; - widget_class = GTK_WIDGET_CLASS (klass); - widget_class->style_updated = gtk_app_chooser_dialog_style_updated; - g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type"); /** @@ -718,8 +678,6 @@ gtk_app_chooser_dialog_init (GtkAppChooserDialog *self) */ g_signal_connect (self, "response", G_CALLBACK (gtk_app_chooser_dialog_response), NULL); - - update_spacings (self); } static void diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 3e1e9692b0..7929812d62 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -579,16 +579,14 @@ gtk_application_window_real_get_preferred_width (GtkWidget *widget, if (window->priv->menubar != NULL) { gint menubar_min_width, menubar_nat_width; - gint border_width; GtkBorder border = { 0 }; gtk_widget_get_preferred_width (window->priv->menubar, &menubar_min_width, &menubar_nat_width); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); _gtk_window_get_shadow_width (GTK_WINDOW (widget), &border); - menubar_min_width += 2 * border_width + border.left + border.right; - menubar_nat_width += 2 * border_width + border.left + border.right; + menubar_min_width += border.left + border.right; + menubar_nat_width += border.left + border.right; *minimum_width = MAX (*minimum_width, menubar_min_width); *natural_width = MAX (*natural_width, menubar_nat_width); @@ -615,16 +613,14 @@ gtk_application_window_real_get_preferred_width_for_height (GtkWidget *widget, if (window->priv->menubar != NULL) { gint menubar_min_width, menubar_nat_width; - gint border_width; GtkBorder border = { 0 }; gtk_widget_get_preferred_width_for_height (window->priv->menubar, menubar_height, &menubar_min_width, &menubar_nat_width); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); _gtk_window_get_shadow_width (GTK_WINDOW (widget), &border); - menubar_min_width += 2 * border_width + border.left + border.right; - menubar_nat_width += 2 * border_width + border.left + border.right; + menubar_min_width += border.left + border.right; + menubar_nat_width += border.left + border.right; *minimum_width = MAX (*minimum_width, menubar_min_width); *natural_width = MAX (*natural_width, menubar_nat_width); diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 979f2a8444..9ea859f7d2 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -203,7 +203,6 @@ gtk_button_box_class_init (GtkButtonBoxClass *class) container_class->add = gtk_button_box_add; container_class->set_child_property = gtk_button_box_set_child_property; container_class->get_child_property = gtk_button_box_get_child_property; - gtk_container_class_handle_border_width (container_class); /** * GtkButtonBox:child-min-width: diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index 1295a37bc2..2fba246162 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -171,15 +171,6 @@ gtk_bin_forall (GtkContainer *container, (* callback) (priv->child, callback_data); } -static int -gtk_bin_get_effective_border_width (GtkBin *bin) -{ - if (GTK_CONTAINER_CLASS (GTK_BIN_GET_CLASS (bin))->_handle_border_width) - return 0; - - return gtk_container_get_border_width (GTK_CONTAINER (bin)); -} - static void gtk_bin_get_preferred_width (GtkWidget *widget, gint *minimum_width, @@ -187,7 +178,6 @@ gtk_bin_get_preferred_width (GtkWidget *widget, { GtkBin *bin = GTK_BIN (widget); GtkBinPrivate *priv = bin->priv; - gint border_width; *minimum_width = 0; *natural_width = 0; @@ -200,10 +190,6 @@ gtk_bin_get_preferred_width (GtkWidget *widget, *minimum_width = child_min; *natural_width = child_nat; } - - border_width = gtk_bin_get_effective_border_width (bin); - *minimum_width += 2 * border_width; - *natural_width += 2 * border_width; } static void @@ -213,7 +199,6 @@ gtk_bin_get_preferred_height (GtkWidget *widget, { GtkBin *bin = GTK_BIN (widget); GtkBinPrivate *priv = bin->priv; - gint border_width; *minimum_height = 0; *natural_height = 0; @@ -226,10 +211,6 @@ gtk_bin_get_preferred_height (GtkWidget *widget, *minimum_height = child_min; *natural_height = child_nat; } - - border_width = gtk_bin_get_effective_border_width (bin); - *minimum_height += 2 * border_width; - *natural_height += 2 * border_width; } static void @@ -240,25 +221,19 @@ gtk_bin_get_preferred_width_for_height (GtkWidget *widget, { GtkBin *bin = GTK_BIN (widget); GtkBinPrivate *priv = bin->priv; - gint border_width; *minimum_width = 0; *natural_width = 0; - border_width = gtk_bin_get_effective_border_width (bin); - if (priv->child && gtk_widget_get_visible (priv->child)) { gint child_min, child_nat; - gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width, + gtk_widget_get_preferred_width_for_height (priv->child, height, &child_min, &child_nat); *minimum_width = child_min; *natural_width = child_nat; } - - *minimum_width += 2 * border_width; - *natural_width += 2 * border_width; } static void @@ -269,25 +244,19 @@ gtk_bin_get_preferred_height_for_width (GtkWidget *widget, { GtkBin *bin = GTK_BIN (widget); GtkBinPrivate *priv = bin->priv; - gint border_width; *minimum_height = 0; *natural_height = 0; - border_width = gtk_bin_get_effective_border_width (bin); - if (priv->child && gtk_widget_get_visible (priv->child)) { gint child_min, child_nat; - gtk_widget_get_preferred_height_for_width (priv->child, width - 2 * border_width, + gtk_widget_get_preferred_height_for_width (priv->child, width, &child_min, &child_nat); *minimum_height = child_min; *natural_height = child_nat; } - - *minimum_height += 2 * border_width; - *natural_height += 2 * border_width; } static void @@ -301,15 +270,7 @@ gtk_bin_size_allocate (GtkWidget *widget, if (priv->child && gtk_widget_get_visible (priv->child)) { - GtkAllocation child_allocation; - gint border_width = gtk_bin_get_effective_border_width (bin); - - child_allocation.x = allocation->x + border_width; - child_allocation.y = allocation->y + border_width; - child_allocation.width = allocation->width - 2 * border_width; - child_allocation.height = allocation->height - 2 * border_width; - - gtk_widget_size_allocate (priv->child, &child_allocation); + gtk_widget_size_allocate (priv->child, allocation); } } diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index f0e0f7bebb..ddb680ba3e 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -265,7 +265,6 @@ gtk_box_class_init (GtkBoxClass *class) container_class->set_child_property = gtk_box_set_child_property; container_class->get_child_property = gtk_box_get_child_property; container_class->get_path_for_child = gtk_box_get_path_for_child; - gtk_container_class_handle_border_width (container_class); g_object_class_override_property (object_class, PROP_ORIENTATION, diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 0e4eacae05..547461eeca 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -174,10 +174,8 @@ * <object class="GtkDialog" id="dialog1"> * <child internal-child="vbox"> * <object class="GtkBox" id="vbox1"> - * <property name="border-width">10</property> * <child internal-child="action_area"> * <object class="GtkButtonBox" id="hbuttonbox1"> - * <property name="border-width">20</property> * <child> * <object class="GtkButton" id="ok_button"> * <property name="label">gtk-ok</property> diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 4b17c3338f..dbe7d82709 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -219,11 +219,9 @@ gtk_button_class_init (GtkButtonClass *klass) { GObjectClass *gobject_class; GtkWidgetClass *widget_class; - GtkContainerClass *container_class; gobject_class = G_OBJECT_CLASS (klass); widget_class = (GtkWidgetClass*) klass; - container_class = (GtkContainerClass*) klass; gobject_class->constructed = gtk_button_constructed; gobject_class->dispose = gtk_button_dispose; @@ -250,8 +248,6 @@ gtk_button_class_init (GtkButtonClass *klass) widget_class->state_changed = gtk_button_state_changed; widget_class->grab_notify = gtk_button_grab_notify; - gtk_container_class_handle_border_width (container_class); - klass->clicked = NULL; klass->activate = gtk_real_button_activate; diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index a3044a0697..603bf4ab05 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -668,8 +668,6 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) container_class->add = gtk_combo_box_add; container_class->remove = gtk_combo_box_remove; - gtk_container_class_handle_border_width (container_class); - widget_class = (GtkWidgetClass *)klass; widget_class->size_allocate = gtk_combo_box_size_allocate; widget_class->draw = gtk_combo_box_draw; diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index d90370b0b4..fcd086d765 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -280,9 +280,6 @@ struct _GtkContainerPrivate GdkFrameClock *resize_clock; guint resize_handler; - guint border_width : 16; - guint border_width_set : 1; - guint has_focus_chain : 1; guint reallocate_redraws : 1; guint restyle_pending : 1; @@ -301,7 +298,6 @@ enum { enum { PROP_0, - PROP_BORDER_WIDTH, PROP_RESIZE_MODE, PROP_CHILD, LAST_PROP @@ -350,21 +346,6 @@ static gint gtk_container_draw (GtkWidget *widget, cairo_t *cr); static void gtk_container_map (GtkWidget *widget); static void gtk_container_unmap (GtkWidget *widget); -static void gtk_container_adjust_size_request (GtkWidget *widget, - GtkOrientation orientation, - gint *minimum_size, - gint *natural_size); -static void gtk_container_adjust_baseline_request (GtkWidget *widget, - gint *minimum_baseline, - gint *natural_baseline); -static void gtk_container_adjust_size_allocation (GtkWidget *widget, - GtkOrientation orientation, - gint *minimum_size, - gint *natural_size, - gint *allocated_pos, - gint *allocated_size); -static void gtk_container_adjust_baseline_allocation (GtkWidget *widget, - gint *baseline); static GtkSizeRequestMode gtk_container_get_request_mode (GtkWidget *widget); static gchar* gtk_container_child_default_composite_name (GtkContainer *container, @@ -510,11 +491,6 @@ gtk_container_class_init (GtkContainerClass *class) widget_class->map = gtk_container_map; widget_class->unmap = gtk_container_unmap; widget_class->focus = gtk_container_focus; - - widget_class->adjust_size_request = gtk_container_adjust_size_request; - widget_class->adjust_baseline_request = gtk_container_adjust_baseline_request; - widget_class->adjust_size_allocation = gtk_container_adjust_size_allocation; - widget_class->adjust_baseline_allocation = gtk_container_adjust_baseline_allocation; widget_class->get_request_mode = gtk_container_get_request_mode; class->add = gtk_container_add_unimplemented; @@ -534,14 +510,6 @@ gtk_container_class_init (GtkContainerClass *class) GTK_RESIZE_PARENT, GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED); - container_props[PROP_BORDER_WIDTH] = - g_param_spec_uint ("border-width", - P_("Border width"), - P_("The width of the empty border outside the containers children"), - 0, 65535, - 0, - GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY); - container_props[PROP_CHILD] = g_param_spec_object ("child", P_("Child"), @@ -1674,10 +1642,8 @@ gtk_container_init (GtkContainer *container) priv = container->priv; priv->focus_child = NULL; - priv->border_width = 0; priv->resize_mode = GTK_RESIZE_PARENT; priv->reallocate_redraws = FALSE; - priv->border_width_set = FALSE; } static void @@ -1712,9 +1678,6 @@ gtk_container_set_property (GObject *object, switch (prop_id) { - case PROP_BORDER_WIDTH: - gtk_container_set_border_width (container, g_value_get_uint (value)); - break; case PROP_RESIZE_MODE: G_GNUC_BEGIN_IGNORE_DEPRECATIONS; gtk_container_set_resize_mode (container, g_value_get_enum (value)); @@ -1740,9 +1703,6 @@ gtk_container_get_property (GObject *object, switch (prop_id) { - case PROP_BORDER_WIDTH: - g_value_set_uint (value, priv->border_width); - break; case PROP_RESIZE_MODE: g_value_set_enum (value, priv->resize_mode); break; @@ -1752,86 +1712,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: - * @container: a #GtkContainer - * @border_width: amount of blank space to leave outside - * the container. Valid values are in the range 0-65535 pixels. - * - * Sets the border width of the container. - * - * The border width of a container is the amount of space to leave - * around the outside of the container. The only exception to this is - * #GtkWindow; because toplevel windows can’t leave space outside, - * they leave the space inside. The border is added on all sides of - * the container. To add space to only one side, use a specific - * #GtkWidget:margin property on the child widget, for example - * #GtkWidget:margin-top. - **/ -void -gtk_container_set_border_width (GtkContainer *container, - guint border_width) -{ - GtkContainerPrivate *priv; - - g_return_if_fail (GTK_IS_CONTAINER (container)); - - priv = container->priv; - - if (priv->border_width != border_width) - { - priv->border_width = border_width; - _gtk_container_set_border_width_set (container, TRUE); - - g_object_notify_by_pspec (G_OBJECT (container), container_props[PROP_BORDER_WIDTH]); - - if (_gtk_widget_get_realized (GTK_WIDGET (container))) - gtk_widget_queue_resize (GTK_WIDGET (container)); - } -} - -/** - * gtk_container_get_border_width: - * @container: a #GtkContainer - * - * Retrieves the border width of the container. See - * gtk_container_set_border_width(). - * - * Returns: the current border width - **/ -guint -gtk_container_get_border_width (GtkContainer *container) -{ - g_return_val_if_fail (GTK_IS_CONTAINER (container), 0); - - return container->priv->border_width; -} - /** * gtk_container_add: * @container: a #GtkContainer @@ -2240,111 +2120,6 @@ gtk_container_resize_children (GtkContainer *container) gtk_widget_size_allocate_with_baseline (widget, &allocation, baseline); } -static void -gtk_container_adjust_size_request (GtkWidget *widget, - GtkOrientation orientation, - gint *minimum_size, - gint *natural_size) -{ - GtkContainer *container; - - container = GTK_CONTAINER (widget); - - if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width) - { - int border_width; - - border_width = container->priv->border_width; - - *minimum_size += border_width * 2; - *natural_size += border_width * 2; - } - - /* chain up last so gtk_widget_set_size_request() values - * will have a chance to overwrite our border width. - */ - parent_class->adjust_size_request (widget, orientation, - minimum_size, natural_size); -} - -static void -gtk_container_adjust_baseline_request (GtkWidget *widget, - gint *minimum_baseline, - gint *natural_baseline) -{ - GtkContainer *container; - - container = GTK_CONTAINER (widget); - - if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width) - { - int border_width; - - border_width = container->priv->border_width; - - *minimum_baseline += border_width; - *natural_baseline += border_width; - } - - parent_class->adjust_baseline_request (widget, minimum_baseline, natural_baseline); -} - -static void -gtk_container_adjust_size_allocation (GtkWidget *widget, - GtkOrientation orientation, - gint *minimum_size, - gint *natural_size, - gint *allocated_pos, - gint *allocated_size) -{ - GtkContainer *container; - int border_width; - - container = GTK_CONTAINER (widget); - - if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width) - { - border_width = container->priv->border_width; - - *allocated_size -= border_width * 2; - *allocated_pos += border_width; - *minimum_size -= border_width * 2; - *natural_size -= border_width * 2; - } - - /* Chain up to GtkWidgetClass *after* removing our border width from - * the proposed allocation size. This is because it's possible that the - * widget was allocated more space than it needs in a said orientation, - * if GtkWidgetClass does any alignments and thus limits the size to the - * natural size... then we need that to be done *after* removing any margins - * and padding values. - */ - parent_class->adjust_size_allocation (widget, orientation, - minimum_size, natural_size, allocated_pos, - allocated_size); -} - -static void -gtk_container_adjust_baseline_allocation (GtkWidget *widget, - gint *baseline) -{ - GtkContainer *container; - int border_width; - - container = GTK_CONTAINER (widget); - - if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width) - { - border_width = container->priv->border_width; - - if (*baseline >= 0) - *baseline -= border_width; - } - - parent_class->adjust_baseline_allocation (widget, baseline); -} - - typedef struct { gint hfw; gint wfh; @@ -2387,29 +2162,6 @@ gtk_container_get_request_mode (GtkWidget *widget) } /** - * gtk_container_class_handle_border_width: - * @klass: the class struct of a #GtkContainer subclass - * - * Modifies a subclass of #GtkContainerClass to automatically add and - * remove the border-width setting on GtkContainer. This allows the - * subclass to ignore the border width in its size request and - * allocate methods. The intent is for a subclass to invoke this - * in its class_init function. - * - * gtk_container_class_handle_border_width() is necessary because it - * would break API too badly to make this behavior the default. So - * subclasses must “opt in” to the parent class handling border_width - * for them. - */ -void -gtk_container_class_handle_border_width (GtkContainerClass *klass) -{ - g_return_if_fail (GTK_IS_CONTAINER_CLASS (klass)); - - klass->_handle_border_width = TRUE; -} - -/** * gtk_container_forall: (virtual forall) * @container: a #GtkContainer * @callback: (scope call) (closure callback_data): a callback diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index ea87bd91c8..63420cd5bb 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -107,8 +107,6 @@ struct _GtkContainerClass /*< private >*/ - unsigned int _handle_border_width : 1; - /* Padding for future expansion */ void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void); @@ -139,11 +137,7 @@ typedef enum GDK_AVAILABLE_IN_ALL GType gtk_container_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL -void gtk_container_set_border_width (GtkContainer *container, - guint border_width); -GDK_AVAILABLE_IN_ALL -guint gtk_container_get_border_width (GtkContainer *container); + GDK_AVAILABLE_IN_ALL void gtk_container_add (GtkContainer *container, GtkWidget *widget); @@ -293,9 +287,6 @@ void gtk_container_forall (GtkContainer *container, gpointer callback_data); GDK_AVAILABLE_IN_ALL -void gtk_container_class_handle_border_width (GtkContainerClass *klass); - -GDK_AVAILABLE_IN_ALL GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer *container, GtkWidget *child); diff --git a/gtk/gtkcontainerprivate.h b/gtk/gtkcontainerprivate.h index 7402a6676b..0681909d51 100644 --- a/gtk/gtkcontainerprivate.h +++ b/gtk/gtkcontainerprivate.h @@ -39,9 +39,6 @@ gboolean _gtk_container_get_reallocate_redraws (GtkContainer *container); void _gtk_container_stop_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); void gtk_container_get_children_clip (GtkContainer *container, GtkAllocation *out_clip); void gtk_container_set_default_resize_mode (GtkContainer *container, diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index ff6fa9f70c..375891e425 100644 --- a/gtk/gtkcustompaperunixdialog.c +++ b/gtk/gtkcustompaperunixdialog.c @@ -1021,7 +1021,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) { GtkCustomPaperUnixDialogPrivate *priv = dialog->priv; GtkDialog *cpu_dialog = GTK_DIALOG (dialog); - GtkWidget *action_area, *content_area; + GtkWidget *content_area; GtkWidget *grid, *label, *widget, *frame, *combo; GtkWidget *hbox, *vbox, *treeview, *scrolled, *toolbar, *button; GtkCellRenderer *cell; @@ -1033,16 +1033,9 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) GtkStyleContext *context; content_area = gtk_dialog_get_content_area (cpu_dialog); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - action_area = gtk_dialog_get_action_area (cpu_dialog); -G_GNUC_END_IGNORE_DEPRECATIONS - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); - gtk_box_set_spacing (GTK_BOX (action_area), 6); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE); gtk_widget_show (hbox); diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 0a6fa6c6cd..0b6538b292 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -576,22 +576,6 @@ gtk_dialog_class_init (GtkDialogClass *class) 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, - g_param_spec_int ("content-area-border", - P_("Content area border"), - P_("Width of border around the main dialog area"), - 0, - G_MAXINT, - 2, - GTK_PARAM_READABLE)); - /** * GtkDialog:content-area-spacing: * * The default spacing used between elements of the @@ -619,23 +603,6 @@ gtk_dialog_class_init (GtkDialogClass *class) GTK_PARAM_READABLE)); /** - * GtkDialog:action-area-border: - * - * The default border width used around the - * action area of the dialog, as returned by - * gtk_dialog_get_action_area(), unless gtk_container_set_border_width() - * was called on that widget directly. - */ - gtk_widget_class_install_style_property (widget_class, - g_param_spec_int ("action-area-border", - P_("Action area border"), - P_("Width of border around the button area at the bottom of the dialog"), - 0, - G_MAXINT, - 5, - GTK_PARAM_READABLE)); - - /** * GtkDialog:use-header-bar: * * %TRUE if the dialog uses a #GtkHeaderBar for action buttons @@ -673,25 +640,14 @@ static void update_spacings (GtkDialog *dialog) { GtkDialogPrivate *priv = dialog->priv; - gint content_area_border; gint content_area_spacing; gint button_spacing; - gint action_area_border; gtk_widget_style_get (GTK_WIDGET (dialog), - "content-area-border", &content_area_border, "content-area-spacing", &content_area_spacing, "button-spacing", &button_spacing, - "action-area-border", &action_area_border, NULL); - if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->vbox))) - { - gtk_container_set_border_width (GTK_CONTAINER (priv->vbox), - content_area_border); - _gtk_container_set_border_width_set (GTK_CONTAINER (priv->vbox), FALSE); - } - if (!_gtk_box_get_spacing_set (GTK_BOX (priv->vbox))) { gtk_box_set_spacing (GTK_BOX (priv->vbox), content_area_spacing); @@ -701,13 +657,6 @@ update_spacings (GtkDialog *dialog) /* don't set spacing when buttons are linked */ if (gtk_button_box_get_layout (GTK_BUTTON_BOX (priv->action_area)) != GTK_BUTTONBOX_EXPAND) gtk_box_set_spacing (GTK_BOX (priv->action_area), button_spacing); - - if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->action_area))) - { - gtk_container_set_border_width (GTK_CONTAINER (priv->action_area), - action_area_border); - _gtk_container_set_border_width_set (GTK_CONTAINER (priv->action_area), FALSE); - } } static void diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index fa4a794f7b..9d30895b79 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -2567,7 +2567,6 @@ gtk_entry_ensure_magnifier (GtkEntry *entry) gtk_popover_set_modal (GTK_POPOVER (priv->magnifier_popover), FALSE); gtk_container_add (GTK_CONTAINER (priv->magnifier_popover), priv->magnifier); - gtk_container_set_border_width (GTK_CONTAINER (priv->magnifier_popover), 4); gtk_widget_show (priv->magnifier); } diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c index dc06847ac9..2f92131233 100644 --- a/gtk/gtkeventbox.c +++ b/gtk/gtkeventbox.c @@ -91,7 +91,6 @@ gtk_event_box_class_init (GtkEventBoxClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); - GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class); gobject_class->set_property = gtk_event_box_set_property; gobject_class->get_property = gtk_event_box_get_property; @@ -106,8 +105,6 @@ gtk_event_box_class_init (GtkEventBoxClass *class) widget_class->size_allocate = gtk_event_box_size_allocate; widget_class->draw = gtk_event_box_draw; - gtk_container_class_handle_border_width (container_class); - g_object_class_install_property (gobject_class, PROP_VISIBLE_WINDOW, g_param_spec_boolean ("visible-window", diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 05827a2082..9be432059d 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -2681,10 +2681,7 @@ save_widgets_create (GtkFileChooserWidget *impl) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_style_context_add_class (gtk_widget_get_style_context (vbox), "search-bar"); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 0); - priv->save_widgets_table = gtk_grid_new (); - gtk_container_set_border_width (GTK_CONTAINER (priv->save_widgets_table), 10); gtk_box_pack_start (GTK_BOX (vbox), priv->save_widgets_table, FALSE, FALSE); gtk_widget_show (priv->save_widgets_table); gtk_grid_set_row_spacing (GTK_GRID (priv->save_widgets_table), 12); diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c index 751e7b3478..2edc2faeb4 100644 --- a/gtk/gtkfixed.c +++ b/gtk/gtkfixed.c @@ -140,7 +140,6 @@ gtk_fixed_class_init (GtkFixedClass *class) container_class->child_type = gtk_fixed_child_type; container_class->set_child_property = gtk_fixed_set_child_property; container_class->get_child_property = gtk_fixed_get_child_property; - gtk_container_class_handle_border_width (container_class); gtk_container_class_install_child_property (container_class, CHILD_PROP_X, diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c index ed50e5f228..b3a914b1af 100644 --- a/gtk/gtkflowbox.c +++ b/gtk/gtkflowbox.c @@ -3798,7 +3798,6 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class) container_class->remove = gtk_flow_box_remove; container_class->forall = gtk_flow_box_forall; container_class->child_type = gtk_flow_box_child_type; - gtk_container_class_handle_border_width (container_class); class->activate_cursor_child = gtk_flow_box_activate_cursor_child; class->toggle_cursor_child = gtk_flow_box_toggle_cursor_child; diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 56fb8c9597..2ad519f5e4 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -272,8 +272,6 @@ gtk_frame_class_init (GtkFrameClass *class) container_class->remove = gtk_frame_remove; container_class->forall = gtk_frame_forall; - gtk_container_class_handle_border_width (container_class); - class->compute_child_allocation = gtk_frame_real_compute_child_allocation; gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FRAME_ACCESSIBLE); diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index 357dbb1bc7..31808d036a 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -1752,7 +1752,6 @@ gtk_grid_class_init (GtkGridClass *class) container_class->child_type = gtk_grid_child_type; container_class->set_child_property = gtk_grid_set_child_property; container_class->get_child_property = gtk_grid_get_child_property; - gtk_container_class_handle_border_width (container_class); g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation"); diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c index f2bde019a6..268eb2086b 100644 --- a/gtk/gtkheaderbar.c +++ b/gtk/gtkheaderbar.c @@ -1984,7 +1984,6 @@ gtk_header_bar_class_init (GtkHeaderBarClass *class) container_class->child_type = gtk_header_bar_child_type; container_class->set_child_property = gtk_header_bar_set_child_property; container_class->get_child_property = gtk_header_bar_get_child_property; - gtk_container_class_handle_border_width (container_class); gtk_container_class_install_child_property (container_class, CHILD_PROP_PACK_TYPE, diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 1f08ed444f..1921dd4edb 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2628,7 +2628,6 @@ gtk_menu_realize (GtkWidget *widget) GdkWindow *window; GdkWindowAttr attributes; gint attributes_mask; - gint border_width; GtkWidget *child; GList *children; GtkBorder arrow_border, padding; @@ -2657,16 +2656,13 @@ gtk_menu_realize (GtkWidget *widget) gtk_widget_register_window (widget, window); get_menu_padding (widget, &padding); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); gtk_widget_get_allocation (widget, &allocation); - attributes.x = border_width + padding.left; - attributes.y = border_width + padding.top; - attributes.width = allocation.width - - (2 * border_width) - padding.left - padding.right; - attributes.height = allocation.height - - (2 * border_width) - padding.top - padding.bottom; + attributes.x = padding.left; + attributes.y = padding.top; + attributes.width = allocation.width - padding.left - padding.right; + attributes.height = allocation.height - padding.top - padding.bottom; get_arrows_border (menu, &arrow_border); attributes.y += arrow_border.top; @@ -2684,10 +2680,8 @@ gtk_menu_realize (GtkWidget *widget) attributes.x = 0; attributes.y = - priv->scroll_offset; - attributes.width = allocation.width + (2 * border_width) + - padding.left + padding.right; - attributes.height = priv->requested_height - (2 * border_width) + - padding.top + padding.bottom; + attributes.width = allocation.width + padding.left + padding.right; + attributes.height = priv->requested_height + padding.top + padding.bottom; attributes.width = MAX (1, attributes.width); attributes.height = MAX (1, attributes.height); @@ -2805,7 +2799,6 @@ calculate_line_heights (GtkMenu *menu, GtkMenuShell *menu_shell; GtkWidget *child, *widget; GList *children; - guint border_width; guint n_columns; gint n_heights; guint *min_heights; @@ -2824,8 +2817,7 @@ calculate_line_heights (GtkMenu *menu, get_menu_padding (widget, &padding); - border_width = gtk_container_get_border_width (GTK_CONTAINER (menu)); - avail_width -= (border_width) * 2 + padding.left + padding.right; + avail_width -= padding.left + padding.right; for (children = menu_shell->priv->children; children; children = children->next) { @@ -2881,7 +2873,6 @@ gtk_menu_size_allocate (GtkWidget *widget, GList *children; gint x, y, i; gint width, height; - guint border_width; GtkBorder arrow_border, padding; g_return_if_fail (GTK_IS_MENU (widget)); @@ -2894,7 +2885,6 @@ gtk_menu_size_allocate (GtkWidget *widget, gtk_widget_set_allocation (widget, allocation); get_menu_padding (widget, &padding); - border_width = gtk_container_get_border_width (GTK_CONTAINER (menu)); g_free (priv->heights); priv->heights_length = calculate_line_heights (menu, @@ -2903,14 +2893,14 @@ gtk_menu_size_allocate (GtkWidget *widget, NULL); /* refresh our cached height request */ - priv->requested_height = (2 * border_width) + padding.top + padding.bottom; + priv->requested_height = padding.top + padding.bottom; for (i = 0; i < priv->heights_length; i++) priv->requested_height += priv->heights[i]; - x = border_width + padding.left; - y = border_width + padding.top; - width = allocation->width - (2 * border_width) - padding.left - padding.right; - height = allocation->height - (2 * border_width) - padding.top - padding.bottom; + x = padding.left; + y = padding.top; + width = allocation->width - padding.left - padding.right; + height = allocation->height - padding.top - padding.bottom; if (menu_shell->priv->active) gtk_menu_scroll_to (menu, priv->scroll_offset); @@ -3077,7 +3067,6 @@ gtk_menu_get_preferred_width (GtkWidget *widget, GList *children; guint max_toggle_size; guint max_accel_width; - guint border_width; gint child_min, child_nat; gint min_width, nat_width; GtkBorder padding; @@ -3160,9 +3149,8 @@ gtk_menu_get_preferred_width (GtkWidget *widget, nat_width *= gtk_menu_get_n_columns (menu); get_menu_padding (widget, &padding); - border_width = gtk_container_get_border_width (GTK_CONTAINER (menu)); - min_width += (2 * border_width) + padding.left + padding.right; - nat_width += (2 * border_width) + padding.left + padding.right; + min_width += padding.left + padding.right; + nat_width += padding.left + padding.right; priv->toggle_size = max_toggle_size; priv->accel_size = max_accel_width; @@ -3195,14 +3183,12 @@ gtk_menu_get_preferred_height_for_width (GtkWidget *widget, GtkMenu *menu = GTK_MENU (widget); GtkMenuPrivate *priv = menu->priv; guint *min_heights, *nat_heights; - guint border_width; gint n_heights, i; gint min_height, single_height, nat_height; - border_width = gtk_container_get_border_width (GTK_CONTAINER (menu)); get_menu_padding (widget, &padding); - min_height = nat_height = (2 * border_width) + padding.top + padding.bottom; + min_height = nat_height = padding.top + padding.bottom; single_height = 0; n_heights = @@ -3216,8 +3202,7 @@ gtk_menu_get_preferred_height_for_width (GtkWidget *widget, } get_arrows_border (menu, &arrow_border); - single_height += (2 * border_width) - + padding.top + padding.bottom + single_height += padding.top + padding.bottom + arrow_border.top + arrow_border.bottom; min_height = MIN (min_height, single_height); @@ -3605,7 +3590,6 @@ get_arrows_sensitive_area (GtkMenu *menu, GtkWidget *widget = GTK_WIDGET (menu); GdkWindow *window; gint width, height; - guint border; gint win_x, win_y; GtkBorder padding; gint top_arrow_height, bottom_arrow_height; @@ -3625,7 +3609,6 @@ get_arrows_sensitive_area (GtkMenu *menu, width = gdk_window_get_width (window); height = gdk_window_get_height (window); - border = gtk_container_get_border_width (GTK_CONTAINER (menu)); get_menu_padding (widget, &padding); gdk_window_get_position (window, &win_x, &win_y); @@ -3635,15 +3618,15 @@ get_arrows_sensitive_area (GtkMenu *menu, upper->x = win_x; upper->y = win_y; upper->width = width; - upper->height = top_arrow_height + border + padding.top; + upper->height = top_arrow_height + padding.top; } if (lower) { lower->x = win_x; - lower->y = win_y + height - border - padding.bottom - bottom_arrow_height; + lower->y = win_y + height - padding.bottom - bottom_arrow_height; lower->width = width; - lower->height = bottom_arrow_height + border + padding.bottom; + lower->height = bottom_arrow_height + padding.bottom; } } @@ -4661,7 +4644,6 @@ gtk_menu_scroll_to (GtkMenu *menu, GtkWidget *widget; gint x, y; gint view_width, view_height; - gint border_width; widget = GTK_WIDGET (menu); @@ -4671,13 +4653,11 @@ gtk_menu_scroll_to (GtkMenu *menu, get_menu_padding (widget, &padding); - border_width = gtk_container_get_border_width (GTK_CONTAINER (menu)); + view_width -= padding.left + padding.right; + view_height -= padding.top + padding.bottom; - view_width -= (2 * border_width) + padding.left + padding.right; - view_height -= (2 * border_width) + padding.top + padding.bottom; - - x = border_width + padding.left; - y = border_width + padding.top; + x = padding.left; + y = padding.top; top_arrow_node = gtk_css_gadget_get_node (priv->top_arrow_gadget); gtk_css_node_set_visible (top_arrow_node, priv->upper_arrow_visible); @@ -4762,8 +4742,7 @@ gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell, get_menu_padding (widget, &padding); - height -= 2 * gtk_container_get_border_width (GTK_CONTAINER (menu)) + - padding.top + padding.bottom; + height -= padding.top + padding.bottom; if (child_offset < y) { @@ -5072,16 +5051,13 @@ get_visible_size (GtkMenu *menu) { GtkAllocation allocation; GtkWidget *widget = GTK_WIDGET (menu); - GtkContainer *container = GTK_CONTAINER (menu); GtkBorder padding, arrow_border; gint menu_height; gtk_widget_get_allocation (widget, &allocation); get_menu_padding (widget, &padding); - menu_height = (allocation.height - - (2 * gtk_container_get_border_width (container)) - - padding.top - padding.bottom); + menu_height = allocation.height - padding.top - padding.bottom; get_arrows_border (menu, &arrow_border); menu_height -= arrow_border.top; @@ -5146,8 +5122,7 @@ get_menu_height (GtkMenu *menu) get_menu_padding (widget, &padding); height = priv->requested_height; - height -= (gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2) + - padding.top + padding.bottom; + height -= padding.top + padding.bottom; get_arrows_border (menu, &arrow_border); height -= arrow_border.top; diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index f6f771d1cb..bdf2ce0214 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -138,14 +138,12 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class) GObjectClass *gobject_class; GtkWidgetClass *widget_class; GtkMenuShellClass *menu_shell_class; - GtkContainerClass *container_class; GtkBindingSet *binding_set; gobject_class = (GObjectClass*) class; widget_class = (GtkWidgetClass*) class; menu_shell_class = (GtkMenuShellClass*) class; - container_class = (GtkContainerClass*) class; gobject_class->get_property = gtk_menu_bar_get_property; gobject_class->set_property = gtk_menu_bar_set_property; @@ -239,7 +237,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class) GTK_PACK_DIRECTION_LTR, GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY)); - gtk_container_class_handle_border_width (container_class); gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR); gtk_widget_class_set_css_name (widget_class, "menubar"); } diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index c4d511f9a5..efa30591e5 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -814,8 +814,6 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ITEM_ACCESSIBLE); gtk_widget_class_set_css_name (widget_class, "menuitem"); - - gtk_container_class_handle_border_width (container_class); } static void diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index ed48e85e18..f55479be64 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -110,8 +110,6 @@ struct _GtkMessageDialogPrivate guint message_type : 3; }; -static void gtk_message_dialog_style_updated (GtkWidget *widget); - static void gtk_message_dialog_constructed (GObject *object); static void gtk_message_dialog_set_property (GObject *object, guint prop_id, @@ -161,23 +159,12 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class) widget_class = GTK_WIDGET_CLASS (class); gobject_class = G_OBJECT_CLASS (class); - widget_class->style_updated = gtk_message_dialog_style_updated; - gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_ALERT); gobject_class->constructed = gtk_message_dialog_constructed; gobject_class->set_property = gtk_message_dialog_set_property; gobject_class->get_property = gtk_message_dialog_get_property; - gtk_widget_class_install_style_property (widget_class, - g_param_spec_int ("message-border", - P_("label border"), - P_("Width of border around the label in the message dialog"), - 0, - G_MAXINT, - 12, - GTK_PARAM_READABLE)); - /** * GtkMessageDialog:message-type: * @@ -323,7 +310,6 @@ gtk_message_dialog_init (GtkMessageDialog *dialog) priv->message_type = GTK_MESSAGE_OTHER; gtk_widget_init_template (GTK_WIDGET (dialog)); - gtk_message_dialog_style_updated (GTK_WIDGET (dialog)); G_GNUC_BEGIN_IGNORE_DEPRECATIONS action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); G_GNUC_END_IGNORE_DEPRECATIONS @@ -971,23 +957,3 @@ gtk_message_dialog_add_buttons (GtkMessageDialog* message_dialog, g_object_notify (G_OBJECT (message_dialog), "buttons"); } -static void -gtk_message_dialog_style_updated (GtkWidget *widget) -{ - GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (widget); - GtkWidget *parent; - gint border_width; - - parent = gtk_widget_get_parent (dialog->priv->message_area); - - if (parent) - { - gtk_widget_style_get (widget, "message-border", - &border_width, NULL); - - gtk_container_set_border_width (GTK_CONTAINER (parent), - MAX (0, border_width - 7)); - } - - GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_updated (widget); -} diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index 83408448e8..db8a602181 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -532,9 +532,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS /* Set the dialog up with HIG properties */ - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); gtk_box_set_spacing (GTK_BOX (action_area), 6); gtk_window_set_resizable (window, FALSE); @@ -550,7 +548,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS /* Build contents */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE); icon = gtk_image_new_from_icon_name ("dialog-password", @@ -1407,7 +1404,6 @@ create_show_processes_dialog (GtkMountOperation *op, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); if (secondary != NULL) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index ea120d2523..430ac06553 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -1152,8 +1152,6 @@ gtk_notebook_class_init (GtkNotebookClass *class) add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD); add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD); - gtk_container_class_handle_border_width (container_class); - gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_NOTEBOOK_ACCESSIBLE); gtk_widget_class_set_css_name (widget_class, "notebook"); } diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c index ec2594c7fb..367927ff77 100644 --- a/gtk/gtkoffscreenwindow.c +++ b/gtk/gtkoffscreenwindow.c @@ -56,13 +56,10 @@ gtk_offscreen_window_get_preferred_width (GtkWidget *widget, { GtkBin *bin = GTK_BIN (widget); GtkWidget *child; - gint border_width; gint default_width; - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - - *minimum = border_width * 2; - *natural = border_width * 2; + *minimum = 0; + *natural = 0; child = gtk_bin_get_child (bin); @@ -90,13 +87,10 @@ gtk_offscreen_window_get_preferred_height (GtkWidget *widget, { GtkBin *bin = GTK_BIN (widget); GtkWidget *child; - gint border_width; gint default_height; - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - - *minimum = border_width * 2; - *natural = border_width * 2; + *minimum = 0; + *natural = 0; child = gtk_bin_get_child (bin); @@ -123,12 +117,9 @@ gtk_offscreen_window_size_allocate (GtkWidget *widget, { GtkBin *bin = GTK_BIN (widget); GtkWidget *child; - gint border_width; gtk_widget_set_allocation (widget, allocation); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - if (gtk_widget_get_realized (widget)) gdk_window_move_resize (gtk_widget_get_window (widget), allocation->x, @@ -142,10 +133,10 @@ gtk_offscreen_window_size_allocate (GtkWidget *widget, { GtkAllocation child_alloc; - child_alloc.x = border_width; - child_alloc.y = border_width; - child_alloc.width = allocation->width - 2 * border_width; - child_alloc.height = allocation->height - 2 * border_width; + child_alloc.x = 0; + child_alloc.y = 0; + child_alloc.width = allocation->width; + child_alloc.height = allocation->height; gtk_widget_size_allocate (child, &child_alloc); } diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 67b39a9b86..9dd2edefbe 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -349,7 +349,6 @@ gtk_paned_class_init (GtkPanedClass *class) container_class->set_focus_child = gtk_paned_set_focus_child; container_class->set_child_property = gtk_paned_set_child_property; container_class->get_child_property = gtk_paned_get_child_property; - gtk_container_class_handle_border_width (container_class); paned_class->cycle_child_focus = gtk_paned_cycle_child_focus; paned_class->toggle_handle_focus = gtk_paned_toggle_handle_focus; diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index b35c5b35ee..9b2265fabd 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -237,7 +237,6 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class) container_class->add = gtk_path_bar_add; container_class->forall = gtk_path_bar_forall; container_class->remove = gtk_path_bar_remove; - gtk_container_class_handle_border_width (container_class); /* FIXME: */ /* container_class->child_type = gtk_path_bar_child_type;*/ diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c index 0105800bbf..a0fae51309 100644 --- a/gtk/gtkplacesview.c +++ b/gtk/gtkplacesview.c @@ -569,7 +569,6 @@ populate_servers (GtkPlacesView *view) grid = g_object_new (GTK_TYPE_GRID, "orientation", GTK_ORIENTATION_VERTICAL, - "border-width", 3, NULL); /* name of the connected uri, if any */ diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 4aee40f7e5..b2716f5d0f 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -1223,19 +1223,16 @@ get_padding_and_border (GtkWidget *widget, GtkBorder *border) { GtkStyleContext *context; - gint border_width; GtkBorder tmp; context = gtk_widget_get_style_context (widget); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - gtk_style_context_get_padding (context, border); gtk_style_context_get_border (context, &tmp); - border->top += tmp.top + border_width; - border->right += tmp.right + border_width; - border->bottom += tmp.bottom + border_width; - border->left += tmp.left + border_width; + border->top += tmp.top; + border->right += tmp.right; + border->bottom += tmp.bottom; + border->left += tmp.left; } static gint diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c index 8486e72c99..f83db7856e 100644 --- a/gtk/gtkrecentchooserdialog.c +++ b/gtk/gtkrecentchooserdialog.c @@ -127,7 +127,7 @@ static void gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog) { GtkRecentChooserDialogPrivate *priv; - GtkWidget *content_area, *action_area; + GtkWidget *content_area; GtkDialog *rc_dialog = GTK_DIALOG (dialog); priv = gtk_recent_chooser_dialog_get_instance_private (dialog); @@ -135,13 +135,8 @@ gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog) gtk_dialog_set_use_header_bar_from_setting (GTK_DIALOG (dialog)); content_area = gtk_dialog_get_content_area (rc_dialog); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - action_area = gtk_dialog_get_action_area (rc_dialog); -G_GNUC_END_IGNORE_DEPRECATIONS - gtk_container_set_border_width (GTK_CONTAINER (rc_dialog), 5); gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); } /* we intercept the GtkRecentChooser::item_activated signal and try to @@ -213,7 +208,6 @@ gtk_recent_chooser_dialog_constructed (GObject *object) content_area = gtk_dialog_get_content_area (GTK_DIALOG (object)); - gtk_container_set_border_width (GTK_CONTAINER (priv->chooser), 5); gtk_box_pack_start (GTK_BOX (content_area), priv->chooser, TRUE, TRUE); gtk_widget_show (priv->chooser); diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 27f467779d..7806c866d1 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -556,7 +556,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) container_class->add = gtk_scrolled_window_add; container_class->remove = gtk_scrolled_window_remove; container_class->forall = gtk_scrolled_window_forall; - gtk_container_class_handle_border_width (container_class); class->scroll_child = gtk_scrolled_window_scroll_child; class->move_focus_out = gtk_scrolled_window_move_focus_out; diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c index 2ec177d29a..4fe60414db 100644 --- a/gtk/gtkshortcutssection.c +++ b/gtk/gtkshortcutssection.c @@ -428,7 +428,6 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self) gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); gtk_box_set_homogeneous (GTK_BOX (self), FALSE); gtk_box_set_spacing (GTK_BOX (self), 22); - gtk_container_set_border_width (GTK_CONTAINER (self), 24); self->stack = g_object_new (GTK_TYPE_STACK, "homogeneous", TRUE, diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c index 1e1bf8f6f2..4f40231267 100644 --- a/gtk/gtkshortcutswindow.c +++ b/gtk/gtkshortcutswindow.c @@ -963,7 +963,6 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) G_GNUC_END_IGNORE_DEPRECATIONS; priv->popover = g_object_new (GTK_TYPE_POPOVER, - "border-width", 6, "relative-to", priv->menu_button, "position", GTK_POS_BOTTOM, NULL); @@ -1002,7 +1001,6 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self) "visible", TRUE, NULL); box = g_object_new (GTK_TYPE_BOX, - "border-width", 24, "halign", GTK_ALIGN_CENTER, "spacing", 24, "orientation", GTK_ORIENTATION_VERTICAL, diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index fe4190e251..a06d4cc2b8 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -134,7 +134,6 @@ * adjustment = gtk_adjustment_new (50.0, 0.0, 100.0, 1.0, 5.0, 0.0); * * window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - * gtk_container_set_border_width (GTK_CONTAINER (window), 5); * * // creates the spinbutton, with no decimal places * button = gtk_spin_button_new (adjustment, 1.0, 0); @@ -166,7 +165,6 @@ * adjustment = gtk_adjustment_new (2.500, 0.0, 5.0, 0.001, 0.1, 0.0); * * window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - * gtk_container_set_border_width (GTK_CONTAINER (window), 5); * * // creates the spinbutton, with three decimal places * button = gtk_spin_button_new (adjustment, 0.001, 3); diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index ca3e4e43e1..44fbe2068b 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -452,7 +452,6 @@ gtk_stack_class_init (GtkStackClass *klass) container_class->forall = gtk_stack_forall; container_class->set_child_property = gtk_stack_set_child_property; container_class->get_child_property = gtk_stack_get_child_property; - gtk_container_class_handle_border_width (container_class); stack_props[PROP_HOMOGENEOUS] = g_param_spec_boolean ("homogeneous", P_("Homogeneous"), P_("Homogeneous sizing"), diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 84b6599d4f..c4ee2228a0 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -1802,7 +1802,6 @@ _gtk_text_view_ensure_magnifier (GtkTextView *text_view) gtk_popover_set_modal (GTK_POPOVER (priv->magnifier_popover), FALSE); gtk_container_add (GTK_CONTAINER (priv->magnifier_popover), priv->magnifier); - gtk_container_set_border_width (GTK_CONTAINER (priv->magnifier_popover), 4); gtk_widget_show (priv->magnifier); } @@ -3976,7 +3975,6 @@ gtk_text_view_size_request (GtkWidget *widget, GtkTextView *text_view; GtkTextViewPrivate *priv; GSList *tmp_list; - guint border_width; text_view = GTK_TEXT_VIEW (widget); priv = text_view->priv; @@ -4007,10 +4005,6 @@ gtk_text_view_size_request (GtkWidget *widget, if (priv->bottom_window) requisition->height += priv->bottom_window->requisition.height; - border_width = gtk_container_get_border_width (GTK_CONTAINER (text_view)); - requisition->width += border_width * 2; - requisition->height += border_width * 2; - requisition->height += priv->top_border + priv->bottom_border; requisition->width += priv->left_border + priv->right_border; @@ -4231,7 +4225,6 @@ gtk_text_view_size_allocate (GtkWidget *widget, GdkRectangle right_rect; GdkRectangle top_rect; GdkRectangle bottom_rect; - guint border_width; gboolean size_changed; text_view = GTK_TEXT_VIEW (widget); @@ -4247,8 +4240,6 @@ gtk_text_view_size_allocate (GtkWidget *widget, widget_allocation.width != allocation->width || widget_allocation.height != allocation->height; - border_width = gtk_container_get_border_width (GTK_CONTAINER (text_view)); - gtk_widget_set_allocation (widget, allocation); if (gtk_widget_get_realized (widget)) @@ -4262,7 +4253,7 @@ gtk_text_view_size_allocate (GtkWidget *widget, * windows get at least a 1x1 allocation. */ - width = allocation->width - border_width * 2; + width = allocation->width; if (priv->left_window) left_rect.width = priv->left_window->requisition.width; @@ -4283,7 +4274,7 @@ gtk_text_view_size_allocate (GtkWidget *widget, top_rect.width = text_rect.width; bottom_rect.width = text_rect.width; - height = allocation->height - border_width * 2; + height = allocation->height; if (priv->top_window) top_rect.height = priv->top_window->requisition.height; @@ -4305,8 +4296,8 @@ gtk_text_view_size_allocate (GtkWidget *widget, right_rect.height = text_rect.height; /* Origins */ - left_rect.x = border_width; - top_rect.y = border_width; + left_rect.x = 0; + top_rect.y = 0; text_rect.x = left_rect.x + left_rect.width; text_rect.y = top_rect.y + top_rect.height; diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 71913da069..e7f270dde6 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -433,8 +433,6 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) container_class->get_child_property = gtk_toolbar_get_child_property; container_class->set_child_property = gtk_toolbar_set_child_property; - gtk_container_class_handle_border_width (container_class); - klass->orientation_changed = gtk_toolbar_orientation_changed; klass->style_changed = gtk_toolbar_real_style_changed; diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index c877985496..0c59eae158 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -169,8 +169,6 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) widget_class->size_allocate = gtk_tool_item_size_allocate; widget_class->parent_set = gtk_tool_item_parent_set; - gtk_container_class_handle_border_width (GTK_CONTAINER_CLASS (klass)); - klass->create_menu_proxy = _gtk_tool_item_create_menu_proxy; g_object_class_install_property (object_class, diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c index 38fedeb4d2..6dd15717a2 100644 --- a/gtk/gtktoolitemgroup.c +++ b/gtk/gtktoolitemgroup.c @@ -582,7 +582,6 @@ gtk_tool_item_group_size_request (GtkWidget *widget, GtkOrientation orientation; GtkRequisition item_size; gint requested_rows; - guint border_width; if (priv->children && gtk_tool_item_group_get_label_widget (group)) { @@ -604,10 +603,6 @@ gtk_tool_item_group_size_request (GtkWidget *widget, requisition->width = MAX (requisition->width, item_size.width); else requisition->height = MAX (requisition->height, item_size.height * requested_rows); - - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - requisition->width += border_width * 2; - requisition->height += border_width * 2; } static void @@ -679,9 +674,7 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget, GtkOrientation orientation; gint min_rows; - guint border_width; - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); orientation = gtk_tool_shell_get_orientation (GTK_TOOL_SHELL (group)); /* figure out the size of homogeneous items */ @@ -713,7 +706,7 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget, gint row = -1; guint col = 0; - item_area.width = allocation->width - 2 * border_width; + item_area.width = allocation->width; n_columns = MAX (item_area.width / item_size.width, 1); /* calculate required rows for n_columns columns */ @@ -770,7 +763,7 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget, guint col = 0, min_col, max_col = 0, all_items = 0; gint i; - item_area.height = allocation->height - 2 * border_width; + item_area.height = allocation->height; n_rows = MAX (item_area.height / item_size.height, min_rows); row_min_width = g_new0 (guint, n_rows); @@ -907,8 +900,8 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget, } /* report effective widget size */ - inquery->width += item_area.width + 2 * border_width; - inquery->height += item_area.height + 2 * border_width; + inquery->width += item_area.width; + inquery->height += item_area.height; } static void @@ -929,11 +922,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget, gint n_columns, n_rows = 1; gint min_rows; - guint border_width; GtkTextDirection direction; - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - direction = gtk_widget_get_direction (widget); orientation = gtk_tool_shell_get_orientation (GTK_TOOL_SHELL (group)); @@ -941,8 +931,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget, /* chain up */ GTK_WIDGET_CLASS (gtk_tool_item_group_parent_class)->size_allocate (widget, allocation); - child_allocation.x = border_width; - child_allocation.y = border_width; + child_allocation.x = 0; + child_allocation.y = 0; /* place the header widget */ if (gtk_widget_get_visible (priv->header)) @@ -961,7 +951,7 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget, child_allocation.height = allocation->height; if (GTK_TEXT_DIR_RTL == direction) - child_allocation.x = allocation->width - border_width - child_allocation.width; + child_allocation.x = allocation->width - child_allocation.width; } gtk_widget_size_allocate (priv->header, &child_allocation); @@ -971,7 +961,7 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget, else if (GTK_TEXT_DIR_RTL != direction) child_allocation.x += child_allocation.width; else - child_allocation.x = border_width; + child_allocation.x = 0; } else child_requisition.width = child_requisition.height = 0; @@ -987,8 +977,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget, { item_size.width = MIN (item_size.width, allocation->width); - item_area.width = allocation->width - 2 * border_width; - item_area.height = allocation->height - 2 * border_width - child_requisition.height; + item_area.width = allocation->width; + item_area.height = allocation->height - child_requisition.height; n_columns = MAX (item_area.width / item_size.width, 1); @@ -998,8 +988,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget, { item_size.height = MIN (item_size.height, allocation->height); - item_area.width = allocation->width - 2 * border_width - child_requisition.width; - item_area.height = allocation->height - 2 * border_width; + item_area.width = allocation->width - child_requisition.width; + item_area.height = allocation->height; n_columns = MAX (item_area.width / item_size.width, 1); n_rows = MAX (item_area.height / item_size.height, min_rows); @@ -1242,18 +1232,16 @@ gtk_tool_item_group_realize (GtkWidget *widget) GdkWindow *window; GdkWindowAttr attributes; gint attributes_mask; - guint border_width; gtk_widget_set_realized (widget, TRUE); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); gtk_widget_get_allocation (widget, &allocation); attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = allocation.x + border_width; - attributes.y = allocation.y + border_width; - attributes.width = allocation.width - border_width * 2; - attributes.height = allocation.height - border_width * 2; + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; attributes.wclass = GDK_INPUT_OUTPUT; attributes.event_mask = gtk_widget_get_events (widget) | GDK_VISIBILITY_NOTIFY_MASK diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c index a5258233c5..93481bf0f5 100644 --- a/gtk/gtktoolpalette.c +++ b/gtk/gtktoolpalette.c @@ -420,11 +420,8 @@ gtk_tool_palette_size_request (GtkWidget *widget, { GtkToolPalette *palette = GTK_TOOL_PALETTE (widget); GtkRequisition child_requisition; - guint border_width; guint i; - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - requisition->width = 0; requisition->height = 0; @@ -449,9 +446,6 @@ gtk_tool_palette_size_request (GtkWidget *widget, requisition->height = MAX (requisition->height, child_requisition.height); } } - - requisition->width += border_width * 2; - requisition->height += border_width * 2; } static void @@ -494,7 +488,6 @@ gtk_tool_palette_size_allocate (GtkWidget *widget, gint total_size, page_size; gint offset = 0; guint i; - guint border_width; gint min_offset = -1, max_offset = -1; @@ -503,7 +496,6 @@ gtk_tool_palette_size_allocate (GtkWidget *widget, gint *group_sizes = g_newa (gint, palette->priv->groups->len); GtkTextDirection direction; - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); direction = gtk_widget_get_direction (widget); GTK_WIDGET_CLASS (gtk_tool_palette_parent_class)->size_allocate (widget, allocation); @@ -526,9 +518,9 @@ gtk_tool_palette_size_allocate (GtkWidget *widget, offset = -offset; if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation) - child_allocation.width = allocation->width - border_width * 2; + child_allocation.width = allocation->width; else - child_allocation.height = allocation->height - border_width * 2; + child_allocation.height = allocation->height; if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation) remaining_space = allocation->height; @@ -613,8 +605,8 @@ gtk_tool_palette_size_allocate (GtkWidget *widget, if (remaining_space > 0) offset = 0; - x = border_width; - child_allocation.y = border_width; + x = 0; + child_allocation.y = 0; if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation) child_allocation.y -= offset; @@ -664,14 +656,12 @@ gtk_tool_palette_size_allocate (GtkWidget *widget, if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation) { - child_allocation.y += border_width; child_allocation.y += offset; total_size = child_allocation.y; } else { - x += border_width; x += offset; total_size = x; @@ -716,19 +706,16 @@ gtk_tool_palette_realize (GtkWidget *widget) GdkWindow *window; GdkWindowAttr attributes; gint attributes_mask; - guint border_width; gtk_widget_set_realized (widget, TRUE); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - gtk_widget_get_allocation (widget, &allocation); attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = allocation.x + border_width; - attributes.y = allocation.y + border_width; - attributes.width = allocation.width - border_width * 2; - attributes.height = allocation.height - border_width * 2; + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; attributes.wclass = GDK_INPUT_OUTPUT; attributes.event_mask = gtk_widget_get_events (widget) | GDK_VISIBILITY_NOTIFY_MASK diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index d03e47e13f..70dda49a85 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -11203,7 +11203,6 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox); gtk_container_add (GTK_CONTAINER (frame), vbox); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 3); /* add entry */ tree_view->priv->search_entry = gtk_entry_new (); diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 1f7b4949e8..ff6ffbae32 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -394,7 +394,6 @@ gtk_viewport_class_init (GtkViewportClass *class) container_class->remove = gtk_viewport_remove; container_class->add = gtk_viewport_add; - gtk_container_class_handle_border_width (container_class); /* GtkScrollable implementation */ g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment"); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 9a329cc9bb..93ad17120d 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -7294,7 +7294,6 @@ _gtk_window_set_allocation (GtkWindow *window, GtkWidget *widget = (GtkWidget *)window; GtkWindowPrivate *priv = window->priv; GtkAllocation child_allocation; - gint border_width; GtkBorder window_border = { 0 }; GList *link; @@ -7356,12 +7355,6 @@ _gtk_window_set_allocation (GtkWindow *window, allocation->width, allocation->height); } - border_width = gtk_container_get_border_width (GTK_CONTAINER (window)); - child_allocation.x += border_width; - child_allocation.y += border_width; - child_allocation.width = MAX (1, child_allocation.width - border_width * 2); - child_allocation.height = MAX (1, child_allocation.height - border_width * 2); - *allocation_out = child_allocation; link = priv->popovers; @@ -8174,7 +8167,6 @@ gtk_window_get_preferred_width (GtkWidget *widget, GtkWindow *window; GtkWidget *child; GtkWindowPrivate *priv; - guint border_width; gint title_min = 0, title_nat = 0; gint child_min = 0, child_nat = 0; GtkBorder window_border = { 0 }; @@ -8185,8 +8177,6 @@ gtk_window_get_preferred_width (GtkWidget *widget, child = gtk_bin_get_child (GTK_BIN (window)); has_size_request = gtk_widget_has_size_request (widget); - border_width = gtk_container_get_border_width (GTK_CONTAINER (window)); - if (priv->decorated && !priv->fullscreen) { @@ -8208,10 +8198,8 @@ gtk_window_get_preferred_width (GtkWidget *widget, if (child_nat == 0 && !has_size_request) child_nat = NO_CONTENT_CHILD_NAT; - child_min += border_width * 2 + - window_border.left + window_border.right; - child_nat += border_width * 2 + - window_border.left + window_border.right; + child_min += window_border.left + window_border.right; + child_nat += window_border.left + window_border.right; } else if (!has_size_request) { @@ -8232,7 +8220,6 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget, GtkWindow *window; GtkWidget *child; GtkWindowPrivate *priv; - guint border_width; gint title_min = 0, title_nat = 0; gint child_min = 0, child_nat = 0; gint title_height = 0; @@ -8244,10 +8231,6 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget, child = gtk_bin_get_child (GTK_BIN (window)); has_size_request = gtk_widget_has_size_request (widget); - border_width = gtk_container_get_border_width (GTK_CONTAINER (window)); - - height -= 2 * border_width; - if (priv->decorated && !priv->fullscreen) { @@ -8279,10 +8262,8 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget, if (child_nat == 0 && height == 0 && !has_size_request) child_nat = NO_CONTENT_CHILD_NAT; - child_min += border_width * 2 + - window_border.left + window_border.right; - child_nat += border_width * 2 + - window_border.left + window_border.right; + child_min += window_border.left + window_border.right; + child_nat += window_border.left + window_border.right; } else if (!has_size_request) { @@ -8301,7 +8282,6 @@ gtk_window_get_preferred_height (GtkWidget *widget, GtkWindow *window; GtkWindowPrivate *priv; GtkWidget *child; - guint border_width; int title_min = 0; int title_height = 0; GtkBorder window_border = { 0 }; @@ -8315,8 +8295,6 @@ gtk_window_get_preferred_height (GtkWidget *widget, *minimum_size = 0; *natural_size = 0; - border_width = gtk_container_get_border_width (GTK_CONTAINER (window)); - if (priv->decorated && !priv->fullscreen) { @@ -8343,8 +8321,8 @@ gtk_window_get_preferred_height (GtkWidget *widget, if (child_nat == 0 && !has_size_request) child_nat = NO_CONTENT_CHILD_NAT; - *minimum_size += child_min + 2 * border_width; - *natural_size += child_nat + 2 * border_width; + *minimum_size += child_min; + *natural_size += child_nat; } else if (!has_size_request) { @@ -8362,7 +8340,6 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget, GtkWindow *window; GtkWindowPrivate *priv; GtkWidget *child; - guint border_width; int title_min = 0; int title_height = 0; GtkBorder window_border = { 0 }; @@ -8376,10 +8353,6 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget, *minimum_size = 0; *natural_size = 0; - border_width = gtk_container_get_border_width (GTK_CONTAINER (window)); - - width -= 2 * border_width; - if (priv->decorated && !priv->fullscreen) { @@ -8410,8 +8383,8 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget, if (child_nat == 0 && width == 0 && !has_size_request) child_nat = NO_CONTENT_CHILD_NAT; - *minimum_size += child_min + 2 * border_width; - *natural_size += child_nat + 2 * border_width; + *minimum_size += child_min; + *natural_size += child_nat; } else if (!has_size_request) { diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui index 9dca96d3c7..aaa9ac20f8 100644 --- a/gtk/ui/gtkaboutdialog.ui +++ b/gtk/ui/gtkaboutdialog.ui @@ -6,7 +6,6 @@ <property name="icon-name">help-about</property> </object> <template class="GtkAboutDialog" parent="GtkDialog"> - <property name="border-width">5</property> <property name="resizable">0</property> <property name="type-hint">dialog</property> <child internal-child="headerbar"> @@ -28,7 +27,6 @@ <child> <object class="GtkBox" id="box"> <property name="visible">1</property> - <property name="border-width">5</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> @@ -169,7 +167,6 @@ <property name="visible">1</property> <property name="halign">center</property> <property name="valign">start</property> - <property name="border-width">5</property> <property name="orientation">vertical</property> <property name="row-spacing">2</property> <property name="column-spacing">8</property> diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui index f3d250df06..0bcc50ae10 100644 --- a/gtk/ui/gtkcolorchooserdialog.ui +++ b/gtk/ui/gtkcolorchooserdialog.ui @@ -2,7 +2,6 @@ <interface domain="gtk30"> <!-- interface-requires gtk+ 3.10 --> <template class="GtkColorChooserDialog" parent="GtkDialog"> - <property name="border-width">5</property> <property name="title" translatable="yes">Select a Color</property> <property name="type-hint">dialog</property> <property name="resizable">0</property> @@ -13,7 +12,6 @@ <child> <object class="GtkColorChooserWidget" id="chooser"> <property name="visible">1</property> - <property name="border-width">5</property> <property name="orientation">vertical</property> <property name="rgba">rgb(255,255,255)</property> <signal name="color-activated" handler="color_activated_cb" swapped="no"/> diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui index 0d88249de7..214cbd4597 100644 --- a/gtk/ui/gtkdialog.ui +++ b/gtk/ui/gtkdialog.ui @@ -15,7 +15,6 @@ <object class="GtkBox" id="vbox"> <property name="visible">1</property> <property name="orientation">vertical</property> - <property name="border-width">0</property> <style> <class name="dialog-vbox"/> </style> diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui index 9315717e79..9cf195dad0 100644 --- a/gtk/ui/gtkfilechooserdialog.ui +++ b/gtk/ui/gtkfilechooserdialog.ui @@ -9,10 +9,8 @@ <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="orientation">vertical</property> - <property name="border-width">0</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="border-width">6</property> <property name="layout-style">end</property> </object> <packing> diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui index b42c2ccae2..42545de942 100644 --- a/gtk/ui/gtkfilechooserwidget.ui +++ b/gtk/ui/gtkfilechooserwidget.ui @@ -54,7 +54,6 @@ <object class="GtkBox"> <property name="visible">1</property> <property name="spacing">6</property> - <property name="border-width">6</property> <child> <object class="GtkPathBar" id="browse_path_bar"> <property name="visible">True</property> @@ -94,7 +93,6 @@ <property name="visible">1</property> <property name="no-show-all">1</property> <property name="spacing">6</property> - <property name="border-width">6</property> </object> <packing> <property name="name">location</property> @@ -105,7 +103,6 @@ <property name="visible">1</property> <property name="no-show-all">1</property> <property name="spacing">6</property> - <property name="border-width">6</property> <child type="center"> <object class="GtkSearchEntry" id="search_entry"> <property name="visible">1</property> diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui index 96891031d8..78e766dc22 100644 --- a/gtk/ui/gtkfontchooserdialog.ui +++ b/gtk/ui/gtkfontchooserdialog.ui @@ -2,7 +2,6 @@ <interface domain="gtk30"> <!-- interface-requires gtk+ 3.10 --> <template class="GtkFontChooserDialog" parent="GtkDialog"> - <property name="border-width">5</property> <property name="title" translatable="yes">Select Font</property> <property name="type-hint">dialog</property> <child internal-child="vbox"> @@ -12,7 +11,6 @@ <child> <object class="GtkFontChooserWidget" id="fontchooser"> <property name="visible">1</property> - <property name="border-width">5</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <signal name="font-activated" handler="font_activated_cb" swapped="no"/> diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui index f8c57b0295..f3bacb2714 100644 --- a/gtk/ui/gtkinfobar.ui +++ b/gtk/ui/gtkinfobar.ui @@ -11,7 +11,6 @@ <child> <object class="GtkBox" id="content_area"> <property name="visible">1</property> - <property name="border-width">8</property> <property name="spacing">16</property> <property name="hexpand">1</property> </object> @@ -22,7 +21,6 @@ <child> <object class="GtkButtonBox" id="action_area"> <property name="visible">1</property> - <property name="border-width">6</property> <property name="spacing">6</property> <property name="layout-style">end</property> </object> @@ -33,7 +31,6 @@ <child> <object class="GtkButton" id="close_button"> <property name="can-focus">1</property> - <property name="border-width">6</property> <property name="relief">none</property> <property name="valign">center</property> <style> diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui index bc3532f46c..ed0626c781 100644 --- a/gtk/ui/gtkmessagedialog.ui +++ b/gtk/ui/gtkmessagedialog.ui @@ -15,7 +15,6 @@ <object class="GtkBox" id="dialog-vbox1"> <property name="orientation">vertical</property> <property name="spacing">20</property> - <property name="border-width">0</property> <child> <object class="GtkBox" id="box"> <property name="visible">1</property> diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui index ae52ba0147..0954cd590b 100644 --- a/gtk/ui/gtkpagesetupunixdialog.ui +++ b/gtk/ui/gtkpagesetupunixdialog.ui @@ -25,7 +25,6 @@ </object> <template class="GtkPageSetupUnixDialog" parent="GtkDialog"> <property name="can-focus">False</property> - <property name="border-width">5</property> <property name="resizable">False</property> <property name="type-hint">dialog</property> <property name="title" translatable="yes">Page Setup</property> @@ -36,7 +35,6 @@ <child> <object class="GtkGrid" id="grid1"> <property name="visible">1</property> - <property name="border-width">5</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui index 9774049852..2765d08feb 100644 --- a/gtk/ui/gtkplacesview.ui +++ b/gtk/ui/gtkplacesview.ui @@ -20,7 +20,6 @@ <child> <object class="GtkBox"> <property name="visible">1</property> - <property name="border-width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -281,7 +280,6 @@ <child> <object class="GtkBox"> <property name="visible">1</property> - <property name="border-width">12</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui index 0d14d4095d..11aae486a9 100644 --- a/gtk/ui/gtkprintunixdialog.ui +++ b/gtk/ui/gtkprintunixdialog.ui @@ -56,7 +56,6 @@ <object class="GtkBox" id="dialog-vbox1"> <property name="orientation">vertical</property> <property name="spacing">2</property> - <property name="border-width">0</property> <style> <class name="view"/> </style> @@ -72,7 +71,6 @@ <child> <object class="GtkBox" id="general_main_box"> <property name="visible">1</property> - <property name="border-width">12</property> <property name="orientation">vertical</property> <property name="spacing">18</property> <child> @@ -430,7 +428,6 @@ <child> <object class="GtkBox" id="page_setup_main_box"> <property name="visible">1</property> - <property name="border-width">12</property> <property name="orientation">vertical</property> <property name="spacing">18</property> <child> @@ -856,7 +853,6 @@ </child> <child> <object class="GtkGrid" id="job_page"> - <property name="border-width">12</property> <property name="row-spacing">18</property> <property name="column-spacing">18</property> <child> @@ -1190,7 +1186,6 @@ <child> <object class="GtkGrid" id="image_quality_table"> <property name="visible">1</property> - <property name="border-width">12</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> </object> @@ -1223,7 +1218,6 @@ <child> <object class="GtkGrid" id="color_table"> <property name="visible">1</property> - <property name="border-width">12</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> </object> @@ -1256,7 +1250,6 @@ <child> <object class="GtkGrid" id="finishing_table"> <property name="visible">1</property> - <property name="border-width">12</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> </object> @@ -1289,7 +1282,6 @@ <child> <object class="GtkBox" id="advanced_vbox"> <property name="visible">1</property> - <property name="border-width">12</property> <property name="orientation">vertical</property> <property name="spacing">18</property> </object> diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui index 0f2aa1c435..93bd05df68 100644 --- a/gtk/ui/gtksearchbar.ui +++ b/gtk/ui/gtksearchbar.ui @@ -9,7 +9,6 @@ <child> <object class="GtkBox" id="tool_box"> <property name="visible">1</property> - <property name="border-width">6</property> <property name="spacing">6</property> <child> <object class="GtkBox" id="box_left"> |