mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-06 08:40:08 +00:00
d9c9259861
It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred".
484 lines
14 KiB
C
484 lines
14 KiB
C
/* GTK - The GIMP Toolkit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "gtkfixed.h"
|
|
|
|
#include "gtkprivate.h"
|
|
#include "gtkintl.h"
|
|
|
|
|
|
struct _GtkFixedPrivate
|
|
{
|
|
GList *children;
|
|
};
|
|
|
|
enum {
|
|
CHILD_PROP_0,
|
|
CHILD_PROP_X,
|
|
CHILD_PROP_Y
|
|
};
|
|
|
|
static void gtk_fixed_realize (GtkWidget *widget);
|
|
static void gtk_fixed_size_request (GtkWidget *widget,
|
|
GtkRequisition *requisition);
|
|
static void gtk_fixed_size_allocate (GtkWidget *widget,
|
|
GtkAllocation *allocation);
|
|
static void gtk_fixed_add (GtkContainer *container,
|
|
GtkWidget *widget);
|
|
static void gtk_fixed_remove (GtkContainer *container,
|
|
GtkWidget *widget);
|
|
static void gtk_fixed_forall (GtkContainer *container,
|
|
gboolean include_internals,
|
|
GtkCallback callback,
|
|
gpointer callback_data);
|
|
static GType gtk_fixed_child_type (GtkContainer *container);
|
|
|
|
static void gtk_fixed_set_child_property (GtkContainer *container,
|
|
GtkWidget *child,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec);
|
|
static void gtk_fixed_get_child_property (GtkContainer *container,
|
|
GtkWidget *child,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec);
|
|
|
|
G_DEFINE_TYPE (GtkFixed, gtk_fixed, GTK_TYPE_CONTAINER)
|
|
|
|
static void
|
|
gtk_fixed_class_init (GtkFixedClass *class)
|
|
{
|
|
GtkWidgetClass *widget_class;
|
|
GtkContainerClass *container_class;
|
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
container_class = (GtkContainerClass*) class;
|
|
|
|
widget_class->realize = gtk_fixed_realize;
|
|
widget_class->size_request = gtk_fixed_size_request;
|
|
widget_class->size_allocate = gtk_fixed_size_allocate;
|
|
|
|
container_class->add = gtk_fixed_add;
|
|
container_class->remove = gtk_fixed_remove;
|
|
container_class->forall = gtk_fixed_forall;
|
|
container_class->child_type = gtk_fixed_child_type;
|
|
|
|
container_class->set_child_property = gtk_fixed_set_child_property;
|
|
container_class->get_child_property = gtk_fixed_get_child_property;
|
|
|
|
gtk_container_class_install_child_property (container_class,
|
|
CHILD_PROP_X,
|
|
g_param_spec_int ("x",
|
|
P_("X position"),
|
|
P_("X position of child widget"),
|
|
G_MININT,
|
|
G_MAXINT,
|
|
0,
|
|
GTK_PARAM_READWRITE));
|
|
|
|
gtk_container_class_install_child_property (container_class,
|
|
CHILD_PROP_Y,
|
|
g_param_spec_int ("y",
|
|
P_("Y position"),
|
|
P_("Y position of child widget"),
|
|
G_MININT,
|
|
G_MAXINT,
|
|
0,
|
|
GTK_PARAM_READWRITE));
|
|
|
|
g_type_class_add_private (class, sizeof (GtkFixedPrivate));
|
|
}
|
|
|
|
static GType
|
|
gtk_fixed_child_type (GtkContainer *container)
|
|
{
|
|
return GTK_TYPE_WIDGET;
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_init (GtkFixed *fixed)
|
|
{
|
|
GtkFixedPrivate *priv;
|
|
|
|
fixed->priv = G_TYPE_INSTANCE_GET_PRIVATE (fixed,
|
|
GTK_TYPE_FIXED,
|
|
GtkFixedPrivate);
|
|
priv = fixed->priv;
|
|
|
|
gtk_widget_set_has_window (GTK_WIDGET (fixed), FALSE);
|
|
|
|
priv->children = NULL;
|
|
}
|
|
|
|
GtkWidget*
|
|
gtk_fixed_new (void)
|
|
{
|
|
return g_object_new (GTK_TYPE_FIXED, NULL);
|
|
}
|
|
|
|
static GtkFixedChild*
|
|
get_child (GtkFixed *fixed,
|
|
GtkWidget *widget)
|
|
{
|
|
GtkFixedPrivate *priv = fixed->priv;
|
|
GList *children;
|
|
|
|
children = priv->children;
|
|
while (children)
|
|
{
|
|
GtkFixedChild *child;
|
|
|
|
child = children->data;
|
|
children = children->next;
|
|
|
|
if (child->widget == widget)
|
|
return child;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
gtk_fixed_put (GtkFixed *fixed,
|
|
GtkWidget *widget,
|
|
gint x,
|
|
gint y)
|
|
{
|
|
GtkFixedPrivate *priv = fixed->priv;
|
|
GtkFixedChild *child_info;
|
|
|
|
g_return_if_fail (GTK_IS_FIXED (fixed));
|
|
g_return_if_fail (GTK_IS_WIDGET (widget));
|
|
|
|
child_info = g_new (GtkFixedChild, 1);
|
|
child_info->widget = widget;
|
|
child_info->x = x;
|
|
child_info->y = y;
|
|
|
|
gtk_widget_set_parent (widget, GTK_WIDGET (fixed));
|
|
|
|
priv->children = g_list_append (priv->children, child_info);
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_move_internal (GtkFixed *fixed,
|
|
GtkWidget *widget,
|
|
gboolean change_x,
|
|
gint x,
|
|
gboolean change_y,
|
|
gint y)
|
|
{
|
|
GtkFixedChild *child;
|
|
|
|
g_return_if_fail (GTK_IS_FIXED (fixed));
|
|
g_return_if_fail (GTK_IS_WIDGET (widget));
|
|
g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (fixed));
|
|
|
|
child = get_child (fixed, widget);
|
|
|
|
g_assert (child);
|
|
|
|
gtk_widget_freeze_child_notify (widget);
|
|
|
|
if (change_x)
|
|
{
|
|
child->x = x;
|
|
gtk_widget_child_notify (widget, "x");
|
|
}
|
|
|
|
if (change_y)
|
|
{
|
|
child->y = y;
|
|
gtk_widget_child_notify (widget, "y");
|
|
}
|
|
|
|
gtk_widget_thaw_child_notify (widget);
|
|
|
|
if (gtk_widget_get_visible (widget) &&
|
|
gtk_widget_get_visible (GTK_WIDGET (fixed)))
|
|
gtk_widget_queue_resize (GTK_WIDGET (fixed));
|
|
}
|
|
|
|
void
|
|
gtk_fixed_move (GtkFixed *fixed,
|
|
GtkWidget *widget,
|
|
gint x,
|
|
gint y)
|
|
{
|
|
gtk_fixed_move_internal (fixed, widget, TRUE, x, TRUE, y);
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_set_child_property (GtkContainer *container,
|
|
GtkWidget *child,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
switch (property_id)
|
|
{
|
|
case CHILD_PROP_X:
|
|
gtk_fixed_move_internal (GTK_FIXED (container),
|
|
child,
|
|
TRUE, g_value_get_int (value),
|
|
FALSE, 0);
|
|
break;
|
|
case CHILD_PROP_Y:
|
|
gtk_fixed_move_internal (GTK_FIXED (container),
|
|
child,
|
|
FALSE, 0,
|
|
TRUE, g_value_get_int (value));
|
|
break;
|
|
default:
|
|
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_get_child_property (GtkContainer *container,
|
|
GtkWidget *child,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GtkFixedChild *fixed_child;
|
|
|
|
fixed_child = get_child (GTK_FIXED (container), child);
|
|
|
|
switch (property_id)
|
|
{
|
|
case CHILD_PROP_X:
|
|
g_value_set_int (value, fixed_child->x);
|
|
break;
|
|
case CHILD_PROP_Y:
|
|
g_value_set_int (value, fixed_child->y);
|
|
break;
|
|
default:
|
|
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_realize (GtkWidget *widget)
|
|
{
|
|
GtkAllocation allocation;
|
|
GdkWindow *window;
|
|
GdkWindowAttr attributes;
|
|
gint attributes_mask;
|
|
|
|
if (!gtk_widget_get_has_window (widget))
|
|
GTK_WIDGET_CLASS (gtk_fixed_parent_class)->realize (widget);
|
|
else
|
|
{
|
|
gtk_widget_set_realized (widget, TRUE);
|
|
|
|
gtk_widget_get_allocation (widget, &allocation);
|
|
|
|
attributes.window_type = GDK_WINDOW_CHILD;
|
|
attributes.x = allocation.x;
|
|
attributes.y = allocation.y;
|
|
attributes.width = allocation.width;
|
|
attributes.height = allocation.height;
|
|
attributes.wclass = GDK_INPUT_OUTPUT;
|
|
attributes.visual = gtk_widget_get_visual (widget);
|
|
attributes.event_mask = gtk_widget_get_events (widget);
|
|
attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK;
|
|
|
|
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
|
|
|
|
window = gdk_window_new (gtk_widget_get_parent_window (widget),
|
|
&attributes, attributes_mask);
|
|
gtk_widget_set_window (widget, window);
|
|
gdk_window_set_user_data (window, widget);
|
|
|
|
gtk_widget_style_attach (widget);
|
|
gtk_style_set_background (gtk_widget_get_style (widget), window, GTK_STATE_NORMAL);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_size_request (GtkWidget *widget,
|
|
GtkRequisition *requisition)
|
|
{
|
|
GtkFixedPrivate *priv;
|
|
GtkFixed *fixed;
|
|
GtkFixedChild *child;
|
|
GList *children;
|
|
GtkRequisition child_requisition;
|
|
guint border_width;
|
|
|
|
fixed = GTK_FIXED (widget);
|
|
priv = fixed->priv;
|
|
|
|
requisition->width = 0;
|
|
requisition->height = 0;
|
|
|
|
children = priv->children;
|
|
while (children)
|
|
{
|
|
child = children->data;
|
|
children = children->next;
|
|
|
|
if (gtk_widget_get_visible (child->widget))
|
|
{
|
|
gtk_widget_get_preferred_size (child->widget,
|
|
&child_requisition,
|
|
NULL);
|
|
|
|
requisition->height = MAX (requisition->height,
|
|
child->y +
|
|
child_requisition.height);
|
|
requisition->width = MAX (requisition->width,
|
|
child->x +
|
|
child_requisition.width);
|
|
}
|
|
}
|
|
|
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (fixed));
|
|
requisition->height += border_width * 2;
|
|
requisition->width += border_width * 2;
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_size_allocate (GtkWidget *widget,
|
|
GtkAllocation *allocation)
|
|
{
|
|
GtkFixed *fixed = GTK_FIXED (widget);
|
|
GtkFixedPrivate *priv = fixed->priv;
|
|
GtkFixedChild *child;
|
|
GtkAllocation child_allocation;
|
|
GtkRequisition child_requisition;
|
|
GList *children;
|
|
guint border_width;
|
|
|
|
gtk_widget_set_allocation (widget, allocation);
|
|
|
|
if (gtk_widget_get_has_window (widget))
|
|
{
|
|
if (gtk_widget_get_realized (widget))
|
|
gdk_window_move_resize (gtk_widget_get_window (widget),
|
|
allocation->x,
|
|
allocation->y,
|
|
allocation->width,
|
|
allocation->height);
|
|
}
|
|
|
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (fixed));
|
|
|
|
children = priv->children;
|
|
while (children)
|
|
{
|
|
child = children->data;
|
|
children = children->next;
|
|
|
|
if (gtk_widget_get_visible (child->widget))
|
|
{
|
|
gtk_widget_get_preferred_size (child->widget,
|
|
&child_requisition, NULL);
|
|
child_allocation.x = child->x + border_width;
|
|
child_allocation.y = child->y + border_width;
|
|
|
|
if (!gtk_widget_get_has_window (widget))
|
|
{
|
|
child_allocation.x += allocation->x;
|
|
child_allocation.y += allocation->y;
|
|
}
|
|
|
|
child_allocation.width = child_requisition.width;
|
|
child_allocation.height = child_requisition.height;
|
|
gtk_widget_size_allocate (child->widget, &child_allocation);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_add (GtkContainer *container,
|
|
GtkWidget *widget)
|
|
{
|
|
gtk_fixed_put (GTK_FIXED (container), widget, 0, 0);
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_remove (GtkContainer *container,
|
|
GtkWidget *widget)
|
|
{
|
|
GtkFixed *fixed = GTK_FIXED (container);
|
|
GtkFixedPrivate *priv = fixed->priv;
|
|
GtkFixedChild *child;
|
|
GtkWidget *widget_container = GTK_WIDGET (container);
|
|
GList *children;
|
|
|
|
children = priv->children;
|
|
while (children)
|
|
{
|
|
child = children->data;
|
|
|
|
if (child->widget == widget)
|
|
{
|
|
gboolean was_visible = gtk_widget_get_visible (widget);
|
|
|
|
gtk_widget_unparent (widget);
|
|
|
|
priv->children = g_list_remove_link (priv->children, children);
|
|
g_list_free (children);
|
|
g_free (child);
|
|
|
|
if (was_visible && gtk_widget_get_visible (widget_container))
|
|
gtk_widget_queue_resize (widget_container);
|
|
|
|
break;
|
|
}
|
|
|
|
children = children->next;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gtk_fixed_forall (GtkContainer *container,
|
|
gboolean include_internals,
|
|
GtkCallback callback,
|
|
gpointer callback_data)
|
|
{
|
|
GtkFixed *fixed = GTK_FIXED (container);
|
|
GtkFixedPrivate *priv = fixed->priv;
|
|
GtkFixedChild *child;
|
|
GList *children;
|
|
|
|
children = priv->children;
|
|
while (children)
|
|
{
|
|
child = children->data;
|
|
children = children->next;
|
|
|
|
(* callback) (child->widget, callback_data);
|
|
}
|
|
}
|