summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-01-09 14:44:34 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2014-01-10 12:10:33 -0500
commit8a1fb19e883e20b2fe333a16fb7393a6e0cd6632 (patch)
treeb66882f7e2d2e9b89c4015b857d06b99e0f02af6
parent99ee1875ab5c1edbb9e75ab75f927ec7bb8b866b (diff)
downloadgtk+-8a1fb19e883e20b2fe333a16fb7393a6e0cd6632.tar.gz
gtkwindow: Rename get_decoration_size => get_shadow_width
-rw-r--r--gtk/gtkapplicationwindow.c4
-rw-r--r--gtk/gtkwindow.c30
-rw-r--r--gtk/gtkwindowprivate.h4
3 files changed, 19 insertions, 19 deletions
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index df337c0b4d..4e2a1b76ac 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -565,7 +565,7 @@ gtk_application_window_real_get_preferred_width (GtkWidget *widget,
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_decoration_size (GTK_WINDOW (widget), &border);
+ _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;
@@ -601,7 +601,7 @@ gtk_application_window_real_get_preferred_width_for_height (GtkWidget *widget,
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_decoration_size (GTK_WINDOW (widget), &border);
+ _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;
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c3259c08bb..c8fb6c02bd 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6140,8 +6140,8 @@ update_window_style_classes (GtkWindow *window)
}
static void
-get_decoration_size (GtkWidget *widget,
- GtkBorder *decorations)
+get_shadow_width (GtkWidget *widget,
+ GtkBorder *shadow_width)
{
GtkWindowPrivate *priv = GTK_WINDOW (widget)->priv;
GtkBorder border = { 0 };
@@ -6152,7 +6152,7 @@ get_decoration_size (GtkWidget *widget,
GtkCssValue *shadows;
gint i;
- *decorations = border;
+ *shadow_width = border;
if (!priv->client_decorated)
return;
@@ -6194,7 +6194,7 @@ get_decoration_size (GtkWidget *widget,
max_borders (&border, &margin);
sum_borders (&d, &border);
- max_borders (decorations, &d);
+ max_borders (shadow_width, &d);
}
gtk_style_context_restore (context);
@@ -6261,7 +6261,7 @@ update_border_windows (GtkWindow *window)
"decoration-resize-handle", &handle,
NULL);
gtk_style_context_restore (context);
- get_decoration_size (widget, &window_border);
+ get_shadow_width (widget, &window_border);
if (!priv->resizable ||
priv->tiled ||
@@ -6574,7 +6574,7 @@ _gtk_window_set_allocation (GtkWindow *window,
gtk_widget_set_allocation (widget, allocation);
- get_decoration_size (widget, &window_border);
+ get_shadow_width (widget, &window_border);
border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
child_allocation.x = 0;
@@ -7042,7 +7042,7 @@ gtk_window_get_resize_grip_area (GtkWindow *window,
if (!priv->has_resize_grip)
return FALSE;
- get_decoration_size (widget, &window_border);
+ get_shadow_width (widget, &window_border);
gtk_widget_get_allocation (widget, &allocation);
gtk_widget_style_get (widget,
@@ -7727,7 +7727,7 @@ gtk_window_get_preferred_width (GtkWidget *widget,
if (priv->decorated &&
!priv->fullscreen)
{
- get_decoration_size (widget, &window_border);
+ get_shadow_width (widget, &window_border);
if (priv->title_box != NULL)
gtk_widget_get_preferred_width (priv->title_box,
@@ -7778,7 +7778,7 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget,
if (priv->decorated &&
!priv->fullscreen)
{
- get_decoration_size (widget, &window_border);
+ get_shadow_width (widget, &window_border);
if (priv->title_box != NULL)
gtk_widget_get_preferred_width_for_height (priv->title_box,
@@ -7831,7 +7831,7 @@ gtk_window_get_preferred_height (GtkWidget *widget,
if (priv->decorated &&
!priv->fullscreen)
{
- get_decoration_size (widget, &window_border);
+ get_shadow_width (widget, &window_border);
if (priv->title_box != NULL)
gtk_widget_get_preferred_height (priv->title_box,
@@ -7884,7 +7884,7 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget,
if (priv->decorated &&
!priv->fullscreen)
{
- get_decoration_size (widget, &window_border);
+ get_shadow_width (widget, &window_border);
if (priv->title_box != NULL)
gtk_widget_get_preferred_height_for_width (priv->title_box,
@@ -9231,7 +9231,7 @@ gtk_window_draw (GtkWidget *widget,
context = gtk_widget_get_style_context (widget);
- get_decoration_size (widget, &window_border);
+ get_shadow_width (widget, &window_border);
gtk_widget_get_allocation (widget, &allocation);
if (!gtk_widget_get_app_paintable (widget) &&
@@ -11559,8 +11559,8 @@ _gtk_window_handle_button_press_for_widget (GtkWidget *widget,
}
void
-_gtk_window_get_decoration_size (GtkWindow *window,
- GtkBorder *border)
+_gtk_window_get_shadow_width (GtkWindow *window,
+ GtkBorder *border)
{
- get_decoration_size (GTK_WIDGET (window), border);
+ get_shadow_width (GTK_WIDGET (window), border);
}
diff --git a/gtk/gtkwindowprivate.h b/gtk/gtkwindowprivate.h
index a1b1f8ee42..8826782c3b 100644
--- a/gtk/gtkwindowprivate.h
+++ b/gtk/gtkwindowprivate.h
@@ -89,8 +89,8 @@ void _gtk_window_notify_keys_changed (GtkWindow *window);
gboolean _gtk_window_titlebar_shows_app_menu (GtkWindow *window);
-void _gtk_window_get_decoration_size (GtkWindow *window,
- GtkBorder *border);
+void _gtk_window_get_shadow_width (GtkWindow *window,
+ GtkBorder *border);
gboolean _gtk_window_get_maximized (GtkWindow *window);
void _gtk_window_toggle_maximized (GtkWindow *window);