X-Git-Url: https://git.draconx.ca/gitweb/aspectbin.git/blobdiff_plain/fcb512f4080197be331d26eca4d2384e20b18e3f..33ab452e00592c8ea9d51fe6be30b8401567b0f7:/aspectbin.c

diff --git a/aspectbin.c b/aspectbin.c
index 7e9095f..c75fe3c 100644
--- a/aspectbin.c
+++ b/aspectbin.c
@@ -1,12 +1,23 @@
 #include <stdio.h>
 #include "aspectbin.h"
 
+enum {
+	PROP_0,
+	PROP_CONSTRAIN,
+	PROP_FILL,
+};
+
 static void aspect_bin_size_request(GtkWidget *, GtkRequisition *);
 static void aspect_bin_size_allocate(GtkWidget *, GtkAllocation *);
+static void aspect_bin_add(GtkContainer *, GtkWidget *);
 static void aspect_bin_remove(GtkContainer *, GtkWidget *);
 static void aspect_bin_forall(GtkContainer *, gboolean, GtkCallback, gpointer);
 static GType aspect_bin_child_type(GtkContainer *);
 
+static void aspect_bin_get_property(GObject *, guint, GValue *, GParamSpec *);
+static void aspect_bin_set_property(GObject *, guint, const GValue *,
+                                                          GParamSpec *);
+
 G_DEFINE_TYPE(AspectBin, aspect_bin, GTK_TYPE_CONTAINER)
 
 static void aspect_bin_init(AspectBin *abin)
@@ -18,19 +29,40 @@ static void aspect_bin_init(AspectBin *abin)
 	abin->ratio     = 1;
 	abin->align     = 0;
 	abin->constrain = FALSE;
+	abin->fill      = TRUE;
 }
 
 static void aspect_bin_class_init(AspectBinClass *class)
 {
+	GObjectClass      *object_class    = G_OBJECT_CLASS(class);
 	GtkWidgetClass    *widget_class    = GTK_WIDGET_CLASS(class);
 	GtkContainerClass *container_class = GTK_CONTAINER_CLASS(class);
 
 	widget_class->size_request  = aspect_bin_size_request;
 	widget_class->size_allocate = aspect_bin_size_allocate;
 
+	container_class->add        = aspect_bin_add;
 	container_class->remove     = aspect_bin_remove;
 	container_class->forall     = aspect_bin_forall;
 	container_class->child_type = aspect_bin_child_type;
+
+	object_class->set_property = aspect_bin_set_property;
+	object_class->get_property = aspect_bin_get_property;
+
+	g_object_class_install_property(object_class,
+		PROP_FILL,
+		g_param_spec_boolean("fill",
+			"Fill",
+			"Allocate all remaining space to the side.",
+			TRUE,
+			G_PARAM_READWRITE));
+	g_object_class_install_property(object_class,
+		PROP_CONSTRAIN,
+		g_param_spec_boolean("constrain",
+			"Constrain",
+			"Only expand the side to be as large as the body.",
+			FALSE,
+			G_PARAM_READWRITE));
 }
 
 GtkWidget *aspect_bin_new(void)
@@ -38,6 +70,60 @@ GtkWidget *aspect_bin_new(void)
 	return GTK_WIDGET(g_object_new(ASPECT_BIN_TYPE, NULL));
 }
 
+static void aspect_bin_set_property(GObject      *object,
+                                    guint         prop_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+	AspectBin *abin = ASPECT_BIN(object);
+
+	switch (prop_id) {
+	case PROP_CONSTRAIN:
+		abin->constrain = g_value_get_boolean(value);
+		gtk_widget_queue_resize(GTK_WIDGET(abin));
+		break;
+	case PROP_FILL:
+		abin->fill = g_value_get_boolean(value);
+		gtk_widget_queue_resize(GTK_WIDGET(abin));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+	}
+}
+
+static void aspect_bin_get_property(GObject    *object,
+                                    guint       prop_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+	AspectBin *abin = ASPECT_BIN(object);
+
+	switch (prop_id) {
+	case PROP_CONSTRAIN:
+		g_value_set_boolean(value, abin->constrain);
+		break;
+	case PROP_FILL:
+		g_value_set_boolean(value, abin->fill);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+	}
+}
+
+static void aspect_bin_add(GtkContainer *container, GtkWidget *widget)
+{
+	AspectBin *abin;
+	g_return_if_fail(IS_ASPECT_BIN(container));
+	abin = ASPECT_BIN(container);
+
+	if (!abin->body)
+		aspect_bin_set_body(abin, widget, 1);
+	else if (!abin->side)
+		aspect_bin_set_side(abin, widget);
+	else
+		g_warning("AspectBin cannot have more than 2 children.\n");
+}
+
 static void aspect_bin_remove(GtkContainer *container, GtkWidget *child)
 {
 	AspectBin *abin = ASPECT_BIN(container);
@@ -126,11 +212,15 @@ aspect_bin_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 		}
 
 		csize.width  = allocation->width - asize.width;
-		csize.height = MIN(allocation->height, creq.height);
-		if (abin->constrain) {
-			csize.height = MAX(csize.height, asize.height);
-		}
 		csize.x = asize.width;
+
+		if (abin->fill && abin->constrain) {
+			csize.height = asize.height;
+		} else if (abin->fill) {
+			csize.height = allocation->height;
+		} else {
+			csize.height = creq.height;
+		}
 	}
 
 	csize.y = (allocation->height - csize.height) * abin->align + 0.5;
@@ -183,3 +273,15 @@ void aspect_bin_set_side(AspectBin *abin, GtkWidget *widget)
 	if (set_widget(&abin->side, GTK_WIDGET(abin), widget))
 		gtk_widget_queue_resize(GTK_WIDGET(abin));
 }
+
+GtkWidget *aspect_bin_get_body(AspectBin *abin)
+{
+	g_return_val_if_fail(IS_ASPECT_BIN(abin), NULL);
+	return abin->body;
+}
+
+GtkWidget *aspect_bin_get_side(AspectBin *abin)
+{
+	g_return_val_if_fail(IS_ASPECT_BIN(abin), NULL);
+	return abin->side;
+}