X-Git-Url: http://git.draconx.ca/gitweb/aspectbin.git/blobdiff_plain/2389929b59b03a0e6ee909f90702a5f7d3741662..7f9cfb4942bdc90c27b9a31d0ffdc9c0b93f2a7b:/aspectbin.c diff --git a/aspectbin.c b/aspectbin.c index 82aba40..07fca93 100644 --- a/aspectbin.c +++ b/aspectbin.c @@ -1,6 +1,17 @@ #include #include "aspectbin.h" +enum { + PROP_0, + PROP_CONSTRAIN, + PROP_FILL, +}; + +enum { + CHILD_PROP_0, + CHILD_PROP_ALIGN, +}; + static void aspect_bin_size_request(GtkWidget *, GtkRequisition *); static void aspect_bin_size_allocate(GtkWidget *, GtkAllocation *); static void aspect_bin_add(GtkContainer *, GtkWidget *); @@ -8,21 +19,32 @@ 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 *); +static void aspect_bin_set_child_property(GtkContainer *, GtkWidget *, guint, + const GValue *, GParamSpec *); +static void aspect_bin_get_child_property(GtkContainer *, GtkWidget *, guint, + GValue *, GParamSpec *); + G_DEFINE_TYPE(AspectBin, aspect_bin, GTK_TYPE_CONTAINER) static void aspect_bin_init(AspectBin *abin) { GTK_WIDGET_SET_FLAGS(abin, GTK_NO_WINDOW); - abin->body = NULL; - abin->side = NULL; - abin->ratio = 1; - abin->align = 0; - abin->constrain = FALSE; + abin->body = NULL; + abin->side = NULL; + abin->ratio = 1; + abin->body_align = 0.5; + abin->side_align = 0.5; + 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); @@ -33,6 +55,34 @@ static void aspect_bin_class_init(AspectBinClass *class) container_class->remove = aspect_bin_remove; container_class->forall = aspect_bin_forall; container_class->child_type = aspect_bin_child_type; + + container_class->set_child_property = aspect_bin_set_child_property; + container_class->get_child_property = aspect_bin_get_child_property; + + 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)); + gtk_container_class_install_child_property(container_class, + CHILD_PROP_ALIGN, + g_param_spec_float("align", + "Alignment", + "Alignment of the child within the available space.", + 0.0, 1.0, 0.5, + G_PARAM_READWRITE)); } GtkWidget *aspect_bin_new(void) @@ -40,6 +90,97 @@ 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_set_child_property(GtkContainer *container, + GtkWidget *child, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + AspectBin *abin = ASPECT_BIN(container); + gfloat align; + + g_assert(child == abin->body || child == abin->side); + + switch (prop_id) { + case CHILD_PROP_ALIGN: + align = g_value_get_float(value); + if (child == abin->body) + abin->body_align = align; + else if (child == abin->side) + abin->side_align = align; + gtk_widget_queue_resize(GTK_WIDGET(abin)); + break; + default: + GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(container, + prop_id, pspec); + } +} + +static void aspect_bin_get_child_property(GtkContainer *container, + GtkWidget *child, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + AspectBin *abin = ASPECT_BIN(container); + gfloat align = 0; + + g_assert(child == abin->body || child == abin->side); + + switch (prop_id) { + case CHILD_PROP_ALIGN: + if (child == abin->body) + align = abin->body_align; + else if (child == abin->side) + align = abin->side_align; + g_value_set_float(value, align); + break; + default: + GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(container, + prop_id, pspec); + } +} + static void aspect_bin_add(GtkContainer *container, GtkWidget *widget) { AspectBin *abin; @@ -142,15 +283,23 @@ 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 = MIN(creq.height, allocation->height); + } } - csize.y = (allocation->height - csize.height) * abin->align + 0.5; - asize.y = (allocation->height - asize.height) * abin->align + 0.5; + asize.y = (allocation->height - asize.height) * abin->body_align + 0.5; + csize.y = (allocation->height - csize.height) * abin->side_align + 0.5; + + if (abin->constrain) { + csize.y = MIN(asize.y, allocation->height - csize.height); + } if (abin->body) gtk_widget_size_allocate(abin->body, &asize); @@ -199,3 +348,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; +}