* 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#include "gtkintl.h"
-struct _GtkBinPriv
+struct _GtkBinPrivate
{
GtkWidget *child;
};
gpointer callback_data);
static GType gtk_bin_child_type (GtkContainer *container);
-
-static void gtk_bin_size_request_init (GtkSizeRequestIface *iface);
-static GtkSizeRequestMode gtk_bin_get_request_mode (GtkSizeRequest *widget);
-static void gtk_bin_get_width_for_height (GtkSizeRequest *widget,
- gint height,
- gint *minimum_width,
- gint *natural_width);
-static void gtk_bin_get_height_for_width (GtkSizeRequest *widget,
- gint width,
- gint *minimum_height,
- gint *natural_height);
-
-static GtkSizeRequestIface *parent_size_request_iface;
-
-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
- gtk_bin_size_request_init))
+static void gtk_bin_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width);
+static void gtk_bin_get_preferred_height (GtkWidget *widget,
+ gint *minimum_height,
+ gint *natural_height);
+static void gtk_bin_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width);
+static void gtk_bin_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height);
+static void gtk_bin_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+
+G_DEFINE_ABSTRACT_TYPE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER)
static void
gtk_bin_class_init (GtkBinClass *class)
{
- GtkContainerClass *container_class;
+ GtkWidgetClass *widget_class = (GtkWidgetClass*) class;
+ GtkContainerClass *container_class = (GtkContainerClass*) class;
- container_class = (GtkContainerClass*) class;
+ widget_class->get_preferred_width = gtk_bin_get_preferred_width;
+ widget_class->get_preferred_height = gtk_bin_get_preferred_height;
+ widget_class->get_preferred_width_for_height = gtk_bin_get_preferred_width_for_height;
+ widget_class->get_preferred_height_for_width = gtk_bin_get_preferred_height_for_width;
+ widget_class->size_allocate = gtk_bin_size_allocate;
container_class->add = gtk_bin_add;
container_class->remove = gtk_bin_remove;
container_class->forall = gtk_bin_forall;
container_class->child_type = gtk_bin_child_type;
- g_type_class_add_private (class, sizeof (GtkBinPriv));
+ g_type_class_add_private (class, sizeof (GtkBinPrivate));
}
static void
gtk_bin_init (GtkBin *bin)
{
- GtkBinPriv *priv;
+ GtkBinPrivate *priv;
bin->priv = G_TYPE_INSTANCE_GET_PRIVATE (bin,
GTK_TYPE_BIN,
- GtkBinPriv);
+ GtkBinPrivate);
priv = bin->priv;
gtk_widget_set_has_window (GTK_WIDGET (bin), FALSE);
static GType
gtk_bin_child_type (GtkContainer *container)
{
- GtkBinPriv *priv = GTK_BIN (container)->priv;
+ GtkBinPrivate *priv = GTK_BIN (container)->priv;
if (!priv->child)
return GTK_TYPE_WIDGET;
GtkWidget *child)
{
GtkBin *bin = GTK_BIN (container);
- GtkBinPriv *priv = bin->priv;
+ GtkBinPrivate *priv = bin->priv;
if (priv->child != NULL)
{
GtkWidget *child)
{
GtkBin *bin = GTK_BIN (container);
- GtkBinPriv *priv = bin->priv;
+ GtkBinPrivate *priv = bin->priv;
gboolean widget_was_visible;
g_return_if_fail (priv->child == child);
gpointer callback_data)
{
GtkBin *bin = GTK_BIN (container);
- GtkBinPriv *priv = bin->priv;
+ GtkBinPrivate *priv = bin->priv;
if (priv->child)
(* callback) (priv->child, callback_data);
}
-
-/* GtkBin widgets define the padding and borders independantly so
- * we cannot provide a generic get_size() for the same reason
- * we never implemented size_request() here.
- *
- * But for cases where the GtkBin class's padding is constant and
- * does not vary based on allocation (most cases), we can at least
- * deduce a common code path for the get_width_for_height()/get_height_for_width()
- * cases by using the delta of the base size requsts.
- */
-static void
-gtk_bin_size_request_init (GtkSizeRequestIface *iface)
+static int
+gtk_bin_get_effective_border_width (GtkBin *bin)
{
- parent_size_request_iface = g_type_interface_peek_parent (iface);
+ if (GTK_CONTAINER_CLASS (GTK_BIN_GET_CLASS (bin))->_handle_border_width)
+ return 0;
- iface->get_request_mode = gtk_bin_get_request_mode;
- iface->get_width_for_height = gtk_bin_get_width_for_height;
- iface->get_height_for_width = gtk_bin_get_height_for_width;
+ return gtk_container_get_border_width (GTK_CONTAINER (bin));
}
-static GtkSizeRequestMode
-gtk_bin_get_request_mode (GtkSizeRequest *widget)
+static void
+gtk_bin_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width)
{
GtkBin *bin = GTK_BIN (widget);
- GtkBinPriv *priv = bin->priv;
+ GtkBinPrivate *priv = bin->priv;
+ gint border_width;
- if (priv->child)
- return gtk_size_request_get_request_mode (GTK_SIZE_REQUEST (priv->child));
+ *minimum_width = 0;
+ *natural_width = 0;
- return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
+ if (priv->child && gtk_widget_get_visible (priv->child))
+ {
+ gint child_min, child_nat;
+ gtk_widget_get_preferred_width (priv->child,
+ &child_min, &child_nat);
+ *minimum_width = child_min;
+ *natural_width = child_nat;
+ }
+
+ border_width = gtk_bin_get_effective_border_width (bin);
+ *minimum_width += 2 * border_width;
+ *natural_width += 2 * border_width;
}
static void
-get_child_padding_delta (GtkBin *bin,
- gint *delta_h,
- gint *delta_v)
+gtk_bin_get_preferred_height (GtkWidget *widget,
+ gint *minimum_height,
+ gint *natural_height)
{
- GtkBinPriv *priv = bin->priv;
- gint hmin, vmin, child_hmin, child_vmin;
+ GtkBin *bin = GTK_BIN (widget);
+ GtkBinPrivate *priv = bin->priv;
+ gint border_width;
- gtk_size_request_get_width (GTK_SIZE_REQUEST (bin), &hmin, NULL);
- gtk_size_request_get_height (GTK_SIZE_REQUEST (bin), &vmin, NULL);
+ *minimum_height = 0;
+ *natural_height = 0;
- gtk_size_request_get_width (GTK_SIZE_REQUEST (priv->child), &child_hmin, NULL);
- gtk_size_request_get_height (GTK_SIZE_REQUEST (priv->child), &child_vmin, NULL);
+ if (priv->child && gtk_widget_get_visible (priv->child))
+ {
+ gint child_min, child_nat;
+ gtk_widget_get_preferred_height (priv->child,
+ &child_min, &child_nat);
+ *minimum_height = child_min;
+ *natural_height = child_nat;
+ }
- *delta_h = hmin - child_hmin;
- *delta_v = vmin - child_vmin;
+ border_width = gtk_bin_get_effective_border_width (bin);
+ *minimum_height += 2 * border_width;
+ *natural_height += 2 * border_width;
}
static void
-gtk_bin_get_width_for_height (GtkSizeRequest *widget,
- gint height,
- gint *minimum_width,
- gint *natural_width)
+gtk_bin_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width)
{
GtkBin *bin = GTK_BIN (widget);
- GtkBinPriv *priv = bin->priv;
- gint hdelta, vdelta, child_min, child_nat;
+ GtkBinPrivate *priv = bin->priv;
+ gint border_width;
- if (priv->child)
+ *minimum_width = 0;
+ *natural_width = 0;
+
+ border_width = gtk_bin_get_effective_border_width (bin);
+
+ if (priv->child && gtk_widget_get_visible (priv->child))
{
- get_child_padding_delta (bin, &hdelta, &vdelta);
+ gint child_min, child_nat;
+ gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width,
+ &child_min, &child_nat);
- gtk_size_request_get_width_for_height (GTK_SIZE_REQUEST (priv->child),
- height - vdelta,
- &child_min, &child_nat);
+ *minimum_width = child_min;
+ *natural_width = child_nat;
+ }
+
+ *minimum_width += 2 * border_width;
+ *natural_width += 2 * border_width;
+}
+
+static void
+gtk_bin_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height)
+{
+ GtkBin *bin = GTK_BIN (widget);
+ GtkBinPrivate *priv = bin->priv;
+ gint border_width;
+
+ *minimum_height = 0;
+ *natural_height = 0;
+
+ border_width = gtk_bin_get_effective_border_width (bin);
- if (minimum_width)
- *minimum_width = child_min + hdelta;
-
- if (natural_width)
- *natural_width = child_nat + hdelta;
+ if (priv->child && gtk_widget_get_visible (priv->child))
+ {
+ gint child_min, child_nat;
+ gtk_widget_get_preferred_height_for_width (priv->child, width - 2 * border_width,
+ &child_min, &child_nat);
+
+ *minimum_height = child_min;
+ *natural_height = child_nat;
}
- else
- GTK_SIZE_REQUEST_GET_IFACE (widget)->get_width (widget, minimum_width, natural_width);
+
+ *minimum_height += 2 * border_width;
+ *natural_height += 2 * border_width;
}
static void
-gtk_bin_get_height_for_width (GtkSizeRequest *widget,
- gint width,
- gint *minimum_height,
- gint *natural_height)
+gtk_bin_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
GtkBin *bin = GTK_BIN (widget);
- GtkBinPriv *priv = bin->priv;
- gint hdelta, vdelta, child_min, child_nat;
+ GtkBinPrivate *priv = bin->priv;
- if (priv->child)
+ gtk_widget_set_allocation (widget, allocation);
+
+ if (priv->child && gtk_widget_get_visible (priv->child))
{
- get_child_padding_delta (bin, &hdelta, &vdelta);
+ GtkAllocation child_allocation;
+ gint border_width = gtk_bin_get_effective_border_width (bin);
- gtk_size_request_get_height_for_width (GTK_SIZE_REQUEST (priv->child),
- width - hdelta,
- &child_min, &child_nat);
+ child_allocation.x = allocation->x + border_width;
+ child_allocation.y = allocation->y + border_width;
+ child_allocation.width = allocation->width - 2 * border_width;
+ child_allocation.height = allocation->height - 2 * border_width;
- if (minimum_height)
- *minimum_height = child_min + vdelta;
-
- if (natural_height)
- *natural_height = child_nat + vdelta;
+ gtk_widget_size_allocate (priv->child, &child_allocation);
}
- else
- GTK_SIZE_REQUEST_GET_IFACE (widget)->get_height (widget, minimum_height, natural_height);
}
-
/**
* gtk_bin_get_child:
* @bin: a #GtkBin
projects / ~andy / gtk / blobdiff