[gimp/gtk3-port: 260/362] app: fix border width of GimpOverlayDialog
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 260/362] app: fix border width of GimpOverlayDialog
- Date: Mon, 7 May 2018 19:26:38 +0000 (UTC)
commit abaa28a9be30a8feb946108506a416bcb4c230b8
Author: Michael Natterer <mitch gimp org>
Date: Sun Apr 29 18:24:02 2018 +0200
app: fix border width of GimpOverlayDialog
app/widgets/gimpoverlaydialog.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/app/widgets/gimpoverlaydialog.c b/app/widgets/gimpoverlaydialog.c
index f5fd739..c3676ba 100644
--- a/app/widgets/gimpoverlaydialog.c
+++ b/app/widgets/gimpoverlaydialog.c
@@ -346,7 +346,6 @@ gimp_overlay_dialog_get_preferred_width (GtkWidget *widget,
gint *natural_width)
{
GimpOverlayDialog *dialog = GIMP_OVERLAY_DIALOG (widget);
- gint border_width;
gint header_minimum;
gint header_natural;
gint action_minimum;
@@ -361,8 +360,8 @@ gimp_overlay_dialog_get_preferred_width (GtkWidget *widget,
gtk_widget_get_preferred_width (dialog->action_area,
&action_minimum, &action_natural);
- *minimum_width = MAX (MAX (*minimum_width, action_minimum), header_minimum) + 2 * border_width;
- *natural_width = MAX (MAX (*natural_width, action_natural), header_natural) + 2 * border_width;
+ *minimum_width = MAX (MAX (*minimum_width, action_minimum), header_minimum);
+ *natural_width = MAX (MAX (*natural_width, action_natural), header_natural);
}
static void
@@ -371,14 +370,11 @@ gimp_overlay_dialog_get_preferred_height (GtkWidget *widget,
gint *natural_height)
{
GimpOverlayDialog *dialog = GIMP_OVERLAY_DIALOG (widget);
- gint border_width;
gint header_minimum;
gint header_natural;
gint action_minimum;
gint action_natural;
- border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
GTK_WIDGET_CLASS (parent_class)->get_preferred_height (widget,
minimum_height,
natural_height);
@@ -388,8 +384,8 @@ gimp_overlay_dialog_get_preferred_height (GtkWidget *widget,
gtk_widget_get_preferred_height (dialog->action_area,
&action_minimum, &action_natural);
- *minimum_height += header_minimum + action_minimum + 2 * border_width;
- *natural_height += header_natural + action_natural + 2 * border_width;
+ *minimum_height += header_minimum + action_minimum;
+ *natural_height += header_natural + action_natural;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]