[gtk+/overlay: 9/34] overlay: fix switch style
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/overlay: 9/34] overlay: fix switch style
- Date: Sat, 11 Jun 2011 00:59:24 +0000 (UTC)
commit 33e16786af91e967d69179079e7d5ffdaa2d9e37
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Thu May 26 13:59:45 2011 +0200
overlay: fix switch style
gtk/gtkoverlay.c | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
---
diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 2659823..4d03b60 100644
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -144,15 +144,15 @@ gtk_overlay_get_property (GObject *object,
switch (prop_id)
{
- case PROP_MAIN_WIDGET:
- g_value_set_object (value, priv->main_widget);
- break;
- case PROP_RELATIVE_WIDGET:
- g_value_set_object (value, priv->relative_widget);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_MAIN_WIDGET:
+ g_value_set_object (value, priv->main_widget);
+ break;
+ case PROP_RELATIVE_WIDGET:
+ g_value_set_object (value, priv->relative_widget);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
@@ -167,16 +167,16 @@ gtk_overlay_set_property (GObject *object,
switch (prop_id)
{
- case PROP_MAIN_WIDGET:
- priv->main_widget = g_value_get_object (value);
- add_child (overlay, priv->main_widget);
- break;
- case PROP_RELATIVE_WIDGET:
- priv->relative_widget = g_value_get_object (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_MAIN_WIDGET:
+ priv->main_widget = g_value_get_object (value);
+ add_child (overlay, priv->main_widget);
+ break;
+ case PROP_RELATIVE_WIDGET:
+ priv->relative_widget = g_value_get_object (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
@@ -268,45 +268,45 @@ gtk_overlay_size_allocate (GtkWidget *widget,
/* FIXME: Add all the positions here */
switch (halign)
{
- case GTK_ALIGN_END:
- switch (valign)
- {
- case GTK_ALIGN_START:
- alloc.x = MAX (main_alloc.x, main_alloc.width - req.width - x_offset);
- alloc.y = y_offset;
- break;
-
- case GTK_ALIGN_END:
- alloc.x = MAX (main_alloc.x, main_alloc.width - req.width - x_offset);
- alloc.y = MAX (main_alloc.y, main_alloc.height - req.height - y_offset);
- break;
-
- default:
- break;
- }
+ case GTK_ALIGN_END:
+ switch (valign)
+ {
+ case GTK_ALIGN_START:
+ alloc.x = MAX (main_alloc.x, main_alloc.width - req.width - x_offset);
+ alloc.y = y_offset;
+ break;
+
+ case GTK_ALIGN_END:
+ alloc.x = MAX (main_alloc.x, main_alloc.width - req.width - x_offset);
+ alloc.y = MAX (main_alloc.y, main_alloc.height - req.height - y_offset);
+ break;
+
+ default:
+ break;
+ }
+ break;
+
+ case GTK_ALIGN_START:
+ switch (valign)
+ {
+ case GTK_ALIGN_START:
+ alloc.x = x_offset;
+ alloc.y = y_offset;
+ break;
+
+ case GTK_ALIGN_END:
+ alloc.x = x_offset;
+ alloc.y = MAX (main_alloc.y, main_alloc.height - req.height - y_offset);
break;
- case GTK_ALIGN_START:
- switch (valign)
- {
- case GTK_ALIGN_START:
- alloc.x = x_offset;
- alloc.y = y_offset;
- break;
-
- case GTK_ALIGN_END:
- alloc.x = x_offset;
- alloc.y = MAX (main_alloc.y, main_alloc.height - req.height - y_offset);
- break;
-
- default:
- break;
- }
+ default:
break;
+ }
+ break;
- default:
- alloc.x = 0;
- alloc.y = 0;
+ default:
+ alloc.x = 0;
+ alloc.y = 0;
}
alloc.width = MIN (main_alloc.width, req.width);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]