X-Git-Url: https://git.draconx.ca/gitweb/aspectbin.git/blobdiff_plain/4451ba5e2b5ef8d480549c4a6a5b7283b4654ff2..HEAD:/aspectbin.c diff --git a/aspectbin.c b/aspectbin.c index 2ce72bd..bc74a67 100644 --- a/aspectbin.c +++ b/aspectbin.c @@ -1,9 +1,35 @@ +/* AspectBin - A GTK+ container for packing with consrained aspect ratio. + * Copyright (C) 2009 Nick Bowler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #include #include "aspectbin.h" enum { PROP_0, + PROP_RATIO, PROP_CONSTRAIN, + PROP_FILL, +}; + +enum { + CHILD_PROP_0, + CHILD_PROP_ALIGN, }; static void aspect_bin_size_request(GtkWidget *, GtkRequisition *); @@ -16,6 +42,10 @@ 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) @@ -23,11 +53,13 @@ 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) @@ -44,16 +76,40 @@ static void aspect_bin_class_init(AspectBinClass *class) 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_CONSTRAIN, + g_object_class_install_property(object_class, + PROP_RATIO, + g_param_spec_float("ratio", + "Aspect Ratio", + "Width:height ratio of the body.", + 0.2, 5.0, 1.0, + G_PARAM_READWRITE)); + 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", - "TRUE if side child should expand only as much as the" - " body", + "Try not to place the side beyond the body's edges.", 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) @@ -67,12 +123,23 @@ static void aspect_bin_set_property(GObject *object, GParamSpec *pspec) { AspectBin *abin = ASPECT_BIN(object); + gfloat tmp; switch (prop_id) { + case PROP_RATIO: + tmp = abin->ratio; + abin->ratio = g_value_get_float(value); + if (tmp != abin->ratio) + gtk_widget_queue_resize(GTK_WIDGET(abin)); + break; 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); } @@ -86,14 +153,71 @@ static void aspect_bin_get_property(GObject *object, AspectBin *abin = ASPECT_BIN(object); switch (prop_id) { + case PROP_RATIO: + g_value_set_float(value, abin->ratio); + break; 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; @@ -196,15 +320,29 @@ 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; + + if (abin->constrain && csize.height <= asize.height) { + csize.y = asize.y + (asize.height-csize.height) + * abin->side_align + 0.5; + } else if (abin->constrain) { + csize.y = (allocation->height - csize.height) + * abin->body_align + 0.5; + } else { + csize.y = (allocation->height - csize.height) + * abin->side_align + 0.5; + } if (abin->body) gtk_widget_size_allocate(abin->body, &asize); @@ -253,3 +391,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; +}