* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999. 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 "gtkscrolledwindow.h"
#include "gtksignal.h"
+/* scrolled window policy and size requisition handling:
+ *
+ * gtk size requisition works as follows:
+ * a widget upon size-request reports the width and height that it finds
+ * to be best suited to display its contents, including children.
+ * the width and/or height reported from a widget upon size requisition
+ * may be overidden by the user by specifying a width and/or height
+ * other than 0 through gtk_widget_set_usize().
+ *
+ * a scrolled window needs (for imlementing all three policy types) to
+ * request its width and height based on two different rationales.
+ * 1) the user wants the scrolled window to just fit into the space
+ * that it gets allocated for a specifc dimension.
+ * 1.1) this does not apply if the user specified a concrete value
+ * value for that specific dimension by either specifying usize for the
+ * scrolled window or for its child.
+ * 2) the user wants the scrolled window to take as much space up as
+ * is desired by the child for a specifc dimension (i.e. POLICY_NEVER).
+ *
+ * also, kinda obvious:
+ * 3) a user would certainly not have choosen a scrolled window as a container
+ * for the child, if the resulting allocation takes up more space than the
+ * child would have allocated without the scrolled window.
+ *
+ * conclusions:
+ * A) from 1) follows: the scrolled window shouldn't request more space for a
+ * specifc dimension than is required at minimum.
+ * B) from 1.1) follows: the requisition may be overidden by usize of the scrolled
+ * window (done automatically) or by usize of the child (needs to be checked).
+ * C) from 2) follows: for POLICY_NEVER, the scrolled window simply reports the
+ * child's dimension.
+ * D) from 3) follows: the scrolled window child's minimum width and minimum height
+ * under A) at least correspond to the space taken up by its scrollbars.
+ */
+
#define SCROLLBAR_SPACING(w) (GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT (w)->klass)->scrollbar_spacing)
+#define DEFAULT_SCROLLBAR_SPACING 3
+
+enum {
+ ARG_0,
+ ARG_HADJUSTMENT,
+ ARG_VADJUSTMENT,
+ ARG_HSCROLLBAR_POLICY,
+ ARG_VSCROLLBAR_POLICY,
+ ARG_WINDOW_PLACEMENT
+};
+
static void gtk_scrolled_window_class_init (GtkScrolledWindowClass *klass);
static void gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window);
+static void gtk_scrolled_window_set_arg (GtkObject *object,
+ GtkArg *arg,
+ guint arg_id);
+static void gtk_scrolled_window_get_arg (GtkObject *object,
+ GtkArg *arg,
+ guint arg_id);
static void gtk_scrolled_window_destroy (GtkObject *object);
static void gtk_scrolled_window_finalize (GtkObject *object);
static void gtk_scrolled_window_map (GtkWidget *widget);
GtkWidget *widget);
static void gtk_scrolled_window_remove (GtkContainer *container,
GtkWidget *widget);
-static void gtk_scrolled_window_foreach (GtkContainer *container,
+static void gtk_scrolled_window_forall (GtkContainer *container,
+ gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
-static void gtk_scrolled_window_viewport_allocate (GtkWidget *widget,
+static void gtk_scrolled_window_relative_allocation(GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
gpointer data);
static GtkContainerClass *parent_class = NULL;
-guint
+GtkType
gtk_scrolled_window_get_type (void)
{
- static guint scrolled_window_type = 0;
+ static GtkType scrolled_window_type = 0;
if (!scrolled_window_type)
{
- GtkTypeInfo scrolled_window_info =
+ static const GtkTypeInfo scrolled_window_info =
{
"GtkScrolledWindow",
sizeof (GtkScrolledWindow),
(GtkClassInitFunc) NULL,
};
- scrolled_window_type = gtk_type_unique (gtk_container_get_type (), &scrolled_window_info);
+ scrolled_window_type = gtk_type_unique (GTK_TYPE_BIN, &scrolled_window_info);
}
return scrolled_window_type;
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
container_class = (GtkContainerClass*) class;
-
- parent_class = gtk_type_class (gtk_container_get_type ());
-
+ parent_class = gtk_type_class (GTK_TYPE_BIN);
+
+ gtk_object_add_arg_type ("GtkScrolledWindow::hadjustment",
+ GTK_TYPE_ADJUSTMENT,
+ GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
+ ARG_HADJUSTMENT);
+ gtk_object_add_arg_type ("GtkScrolledWindow::vadjustment",
+ GTK_TYPE_ADJUSTMENT,
+ GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
+ ARG_VADJUSTMENT);
+ gtk_object_add_arg_type ("GtkScrolledWindow::hscrollbar_policy",
+ GTK_TYPE_POLICY_TYPE,
+ GTK_ARG_READWRITE,
+ ARG_HSCROLLBAR_POLICY);
+ gtk_object_add_arg_type ("GtkScrolledWindow::vscrollbar_policy",
+ GTK_TYPE_POLICY_TYPE,
+ GTK_ARG_READWRITE,
+ ARG_VSCROLLBAR_POLICY);
+ gtk_object_add_arg_type ("GtkScrolledWindow::window_placement",
+ GTK_TYPE_CORNER_TYPE,
+ GTK_ARG_READWRITE,
+ ARG_WINDOW_PLACEMENT);
+
+ object_class->set_arg = gtk_scrolled_window_set_arg;
+ object_class->get_arg = gtk_scrolled_window_get_arg;
object_class->destroy = gtk_scrolled_window_destroy;
object_class->finalize = gtk_scrolled_window_finalize;
container_class->add = gtk_scrolled_window_add;
container_class->remove = gtk_scrolled_window_remove;
- container_class->foreach = gtk_scrolled_window_foreach;
+ container_class->forall = gtk_scrolled_window_forall;
+
+ class->scrollbar_spacing = DEFAULT_SCROLLBAR_SPACING;
+}
- class->scrollbar_spacing = 5;
+static void
+gtk_scrolled_window_set_arg (GtkObject *object,
+ GtkArg *arg,
+ guint arg_id)
+{
+ GtkScrolledWindow *scrolled_window;
+
+ scrolled_window = GTK_SCROLLED_WINDOW (object);
+
+ switch (arg_id)
+ {
+ case ARG_HADJUSTMENT:
+ gtk_scrolled_window_set_hadjustment (scrolled_window, GTK_VALUE_POINTER (*arg));
+ break;
+ case ARG_VADJUSTMENT:
+ gtk_scrolled_window_set_vadjustment (scrolled_window, GTK_VALUE_POINTER (*arg));
+ break;
+ case ARG_HSCROLLBAR_POLICY:
+ gtk_scrolled_window_set_policy (scrolled_window,
+ GTK_VALUE_ENUM (*arg),
+ scrolled_window->vscrollbar_policy);
+ break;
+ case ARG_VSCROLLBAR_POLICY:
+ gtk_scrolled_window_set_policy (scrolled_window,
+ scrolled_window->hscrollbar_policy,
+ GTK_VALUE_ENUM (*arg));
+ break;
+ case ARG_WINDOW_PLACEMENT:
+ gtk_scrolled_window_set_placement (scrolled_window,
+ GTK_VALUE_ENUM (*arg));
+ break;
+ default:
+ break;
+ }
+}
+
+static void
+gtk_scrolled_window_get_arg (GtkObject *object,
+ GtkArg *arg,
+ guint arg_id)
+{
+ GtkScrolledWindow *scrolled_window;
+
+ scrolled_window = GTK_SCROLLED_WINDOW (object);
+
+ switch (arg_id)
+ {
+ case ARG_HADJUSTMENT:
+ GTK_VALUE_POINTER (*arg) = gtk_scrolled_window_get_hadjustment (scrolled_window);
+ break;
+ case ARG_VADJUSTMENT:
+ GTK_VALUE_POINTER (*arg) = gtk_scrolled_window_get_vadjustment (scrolled_window);
+ break;
+ case ARG_HSCROLLBAR_POLICY:
+ GTK_VALUE_ENUM (*arg) = scrolled_window->hscrollbar_policy;
+ break;
+ case ARG_VSCROLLBAR_POLICY:
+ GTK_VALUE_ENUM (*arg) = scrolled_window->vscrollbar_policy;
+ break;
+ case ARG_WINDOW_PLACEMENT:
+ GTK_VALUE_ENUM (*arg) = scrolled_window->window_placement;
+ break;
+ default:
+ arg->type = GTK_TYPE_INVALID;
+ break;
+ }
}
static void
scrolled_window->vscrollbar = NULL;
scrolled_window->hscrollbar_policy = GTK_POLICY_ALWAYS;
scrolled_window->vscrollbar_policy = GTK_POLICY_ALWAYS;
+ scrolled_window->hscrollbar_visible = FALSE;
+ scrolled_window->vscrollbar_visible = FALSE;
+ scrolled_window->window_placement = GTK_CORNER_TOP_LEFT;
}
GtkWidget*
{
GtkWidget *scrolled_window;
- scrolled_window = gtk_type_new (gtk_scrolled_window_get_type ());
+ if (hadjustment)
+ g_return_val_if_fail (GTK_IS_ADJUSTMENT (hadjustment), NULL);
+
+ if (vadjustment)
+ g_return_val_if_fail (GTK_IS_ADJUSTMENT (vadjustment), NULL);
+
+ scrolled_window = gtk_widget_new (GTK_TYPE_SCROLLED_WINDOW,
+ "hadjustment", hadjustment,
+ "vadjustment", vadjustment,
+ NULL);
- gtk_scrolled_window_construct (GTK_SCROLLED_WINDOW (scrolled_window), hadjustment, vadjustment);
-
return scrolled_window;
}
void
-gtk_scrolled_window_construct (GtkScrolledWindow *scrolled_window,
- GtkAdjustment *hadjustment,
- GtkAdjustment *vadjustment)
+gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window,
+ GtkAdjustment *hadjustment)
{
+ GtkBin *bin;
+
g_return_if_fail (scrolled_window != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
- g_return_if_fail (scrolled_window->viewport == NULL);
-
- scrolled_window->viewport = gtk_viewport_new (hadjustment, vadjustment);
- hadjustment = gtk_viewport_get_hadjustment (GTK_VIEWPORT (scrolled_window->viewport));
- vadjustment = gtk_viewport_get_vadjustment (GTK_VIEWPORT (scrolled_window->viewport));
- gtk_container_set_resize_mode (GTK_CONTAINER (scrolled_window->viewport), GTK_RESIZE_PARENT);
-
- gtk_signal_connect (GTK_OBJECT (hadjustment), "changed",
- (GtkSignalFunc) gtk_scrolled_window_adjustment_changed,
- (gpointer) scrolled_window);
- gtk_signal_connect (GTK_OBJECT (vadjustment), "changed",
- (GtkSignalFunc) gtk_scrolled_window_adjustment_changed,
- (gpointer) scrolled_window);
-
- scrolled_window->hscrollbar = gtk_hscrollbar_new (hadjustment);
- scrolled_window->vscrollbar = gtk_vscrollbar_new (vadjustment);
-
- gtk_widget_set_parent (scrolled_window->viewport, GTK_WIDGET (scrolled_window));
- gtk_widget_set_parent (scrolled_window->hscrollbar, GTK_WIDGET (scrolled_window));
- gtk_widget_set_parent (scrolled_window->vscrollbar, GTK_WIDGET (scrolled_window));
-
- gtk_widget_show (scrolled_window->viewport);
- gtk_widget_show (scrolled_window->hscrollbar);
- gtk_widget_show (scrolled_window->vscrollbar);
+ if (hadjustment)
+ g_return_if_fail (GTK_IS_ADJUSTMENT (hadjustment));
+ else
+ hadjustment = (GtkAdjustment*) gtk_object_new (GTK_TYPE_ADJUSTMENT, NULL);
+
+ bin = GTK_BIN (scrolled_window);
+
+ if (!scrolled_window->hscrollbar)
+ {
+ gtk_widget_push_composite_child ();
+ scrolled_window->hscrollbar = gtk_hscrollbar_new (hadjustment);
+ gtk_widget_set_composite_name (scrolled_window->hscrollbar, "hscrollbar");
+ gtk_widget_pop_composite_child ();
+
+ gtk_widget_set_parent (scrolled_window->hscrollbar, GTK_WIDGET (scrolled_window));
+ gtk_widget_ref (scrolled_window->hscrollbar);
+ gtk_widget_show (scrolled_window->hscrollbar);
+ }
+ else
+ {
+ GtkAdjustment *old_adjustment;
+
+ old_adjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
+ if (old_adjustment == hadjustment)
+ return;
+
+ gtk_signal_disconnect_by_func (GTK_OBJECT (old_adjustment),
+ GTK_SIGNAL_FUNC (gtk_scrolled_window_adjustment_changed),
+ scrolled_window);
+ gtk_range_set_adjustment (GTK_RANGE (scrolled_window->hscrollbar),
+ hadjustment);
+ }
+ hadjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
+ gtk_signal_connect (GTK_OBJECT (hadjustment),
+ "changed",
+ GTK_SIGNAL_FUNC (gtk_scrolled_window_adjustment_changed),
+ scrolled_window);
+ gtk_scrolled_window_adjustment_changed (hadjustment, scrolled_window);
- gtk_widget_ref (scrolled_window->viewport);
- gtk_widget_ref (scrolled_window->hscrollbar);
- gtk_widget_ref (scrolled_window->vscrollbar);
+ if (bin->child)
+ gtk_widget_set_scroll_adjustments (bin->child,
+ gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)),
+ gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar)));
+}
+
+void
+gtk_scrolled_window_set_vadjustment (GtkScrolledWindow *scrolled_window,
+ GtkAdjustment *vadjustment)
+{
+ GtkBin *bin;
+
+ g_return_if_fail (scrolled_window != NULL);
+ g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
+ if (vadjustment)
+ g_return_if_fail (GTK_IS_ADJUSTMENT (vadjustment));
+ else
+ vadjustment = (GtkAdjustment*) gtk_object_new (GTK_TYPE_ADJUSTMENT, NULL);
+
+ bin = GTK_BIN (scrolled_window);
+
+ if (!scrolled_window->vscrollbar)
+ {
+ gtk_widget_push_composite_child ();
+ scrolled_window->vscrollbar = gtk_vscrollbar_new (vadjustment);
+ gtk_widget_set_composite_name (scrolled_window->vscrollbar, "vscrollbar");
+ gtk_widget_pop_composite_child ();
+
+ gtk_widget_set_parent (scrolled_window->vscrollbar, GTK_WIDGET (scrolled_window));
+ gtk_widget_ref (scrolled_window->vscrollbar);
+ gtk_widget_show (scrolled_window->vscrollbar);
+ }
+ else
+ {
+ GtkAdjustment *old_adjustment;
+
+ old_adjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
+ if (old_adjustment == vadjustment)
+ return;
+
+ gtk_signal_disconnect_by_func (GTK_OBJECT (old_adjustment),
+ GTK_SIGNAL_FUNC (gtk_scrolled_window_adjustment_changed),
+ scrolled_window);
+ gtk_range_set_adjustment (GTK_RANGE (scrolled_window->vscrollbar),
+ vadjustment);
+ }
+ vadjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
+ gtk_signal_connect (GTK_OBJECT (vadjustment),
+ "changed",
+ GTK_SIGNAL_FUNC (gtk_scrolled_window_adjustment_changed),
+ scrolled_window);
+ gtk_scrolled_window_adjustment_changed (vadjustment, scrolled_window);
+
+ if (bin->child)
+ gtk_widget_set_scroll_adjustments (bin->child,
+ gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)),
+ gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar)));
}
GtkAdjustment*
g_return_val_if_fail (scrolled_window != NULL, NULL);
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL);
- return gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
+ return (scrolled_window->hscrollbar ?
+ gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)) :
+ NULL);
}
GtkAdjustment*
g_return_val_if_fail (scrolled_window != NULL, NULL);
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL);
- return gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
+ return (scrolled_window->vscrollbar ?
+ gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar)) :
+ NULL);
}
void
scrolled_window->hscrollbar_policy = hscrollbar_policy;
scrolled_window->vscrollbar_policy = vscrollbar_policy;
- if (GTK_WIDGET (scrolled_window)->parent)
- gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
+ gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
}
}
+void
+gtk_scrolled_window_set_placement (GtkScrolledWindow *scrolled_window,
+ GtkCornerType window_placement)
+{
+ g_return_if_fail (scrolled_window != NULL);
+ g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
+
+ if (scrolled_window->window_placement != window_placement)
+ {
+ scrolled_window->window_placement = window_placement;
+
+ gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
+ }
+}
static void
gtk_scrolled_window_destroy (GtkObject *object)
scrolled_window = GTK_SCROLLED_WINDOW (object);
- gtk_widget_destroy (scrolled_window->viewport);
+ gtk_widget_unparent (scrolled_window->hscrollbar);
+ gtk_widget_unparent (scrolled_window->vscrollbar);
gtk_widget_destroy (scrolled_window->hscrollbar);
gtk_widget_destroy (scrolled_window->vscrollbar);
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
GtkScrolledWindow *scrolled_window;
scrolled_window = GTK_SCROLLED_WINDOW (object);
- gtk_widget_unref (scrolled_window->viewport);
+
gtk_widget_unref (scrolled_window->hscrollbar);
gtk_widget_unref (scrolled_window->vscrollbar);
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
- if (!GTK_WIDGET_MAPPED (widget))
- {
- GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
- scrolled_window = GTK_SCROLLED_WINDOW (widget);
-
- if (GTK_WIDGET_VISIBLE (scrolled_window->viewport) &&
- !GTK_WIDGET_MAPPED (scrolled_window->viewport))
- gtk_widget_map (scrolled_window->viewport);
-
- if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar) &&
- !GTK_WIDGET_MAPPED (scrolled_window->hscrollbar))
- gtk_widget_map (scrolled_window->hscrollbar);
+ scrolled_window = GTK_SCROLLED_WINDOW (widget);
- if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar) &&
- !GTK_WIDGET_MAPPED (scrolled_window->vscrollbar))
- gtk_widget_map (scrolled_window->vscrollbar);
- }
+ /* chain parent class handler to map self and child */
+ GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+ if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar) &&
+ !GTK_WIDGET_MAPPED (scrolled_window->hscrollbar))
+ gtk_widget_map (scrolled_window->hscrollbar);
+
+ if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar) &&
+ !GTK_WIDGET_MAPPED (scrolled_window->vscrollbar))
+ gtk_widget_map (scrolled_window->vscrollbar);
}
static void
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
- if (GTK_WIDGET_MAPPED (widget))
- {
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
- scrolled_window = GTK_SCROLLED_WINDOW (widget);
-
- if (GTK_WIDGET_MAPPED (scrolled_window->viewport))
- gtk_widget_unmap (scrolled_window->viewport);
-
- if (GTK_WIDGET_MAPPED (scrolled_window->hscrollbar))
- gtk_widget_unmap (scrolled_window->hscrollbar);
+ scrolled_window = GTK_SCROLLED_WINDOW (widget);
- if (GTK_WIDGET_MAPPED (scrolled_window->vscrollbar))
- gtk_widget_unmap (scrolled_window->vscrollbar);
- }
+ /* chain parent class handler to unmap self and child */
+ GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+
+ if (GTK_WIDGET_MAPPED (scrolled_window->hscrollbar))
+ gtk_widget_unmap (scrolled_window->hscrollbar);
+
+ if (GTK_WIDGET_MAPPED (scrolled_window->vscrollbar))
+ gtk_widget_unmap (scrolled_window->vscrollbar);
}
static void
GdkRectangle *area)
{
GtkScrolledWindow *scrolled_window;
+ GtkBin *bin;
GdkRectangle child_area;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
g_return_if_fail (area != NULL);
+
+ scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ bin = GTK_BIN (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- scrolled_window = GTK_SCROLLED_WINDOW (widget);
-
- if (gtk_widget_intersect (scrolled_window->viewport, area, &child_area))
- gtk_widget_draw (scrolled_window->viewport, &child_area);
+ if (bin->child && GTK_WIDGET_VISIBLE (bin->child) &&
+ gtk_widget_intersect (bin->child, area, &child_area))
+ gtk_widget_draw (bin->child, &child_area);
+
+ if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar) &&
+ gtk_widget_intersect (scrolled_window->hscrollbar, area, &child_area))
+ gtk_widget_draw (scrolled_window->hscrollbar, &child_area);
+
+ if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar) &&
+ gtk_widget_intersect (scrolled_window->vscrollbar, area, &child_area))
+ gtk_widget_draw (scrolled_window->vscrollbar, &child_area);
+}
- if (gtk_widget_intersect (scrolled_window->hscrollbar, area, &child_area))
- gtk_widget_draw (scrolled_window->hscrollbar, &child_area);
+static void
+gtk_scrolled_window_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
+{
+ g_return_if_fail (container != NULL);
+ g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container));
+ g_return_if_fail (callback != NULL);
- if (gtk_widget_intersect (scrolled_window->vscrollbar, area, &child_area))
- gtk_widget_draw (scrolled_window->vscrollbar, &child_area);
+ GTK_CONTAINER_CLASS (parent_class)->forall (container,
+ include_internals,
+ callback,
+ callback_data);
+ if (include_internals)
+ {
+ GtkScrolledWindow *scrolled_window;
+
+ scrolled_window = GTK_SCROLLED_WINDOW (container);
+
+ if (scrolled_window->vscrollbar)
+ callback (scrolled_window->vscrollbar, callback_data);
+ if (scrolled_window->hscrollbar)
+ callback (scrolled_window->hscrollbar, callback_data);
}
}
GtkRequisition *requisition)
{
GtkScrolledWindow *scrolled_window;
- gint extra_height;
+ GtkBin *bin;
gint extra_width;
+ gint extra_height;
+ GtkRequisition hscrollbar_requisition;
+ GtkRequisition vscrollbar_requisition;
+ GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
g_return_if_fail (requisition != NULL);
scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ bin = GTK_BIN (scrolled_window);
+ extra_width = 0;
+ extra_height = 0;
requisition->width = 0;
requisition->height = 0;
-
- if (GTK_WIDGET_VISIBLE (scrolled_window->viewport))
+
+ gtk_widget_size_request (scrolled_window->hscrollbar,
+ &hscrollbar_requisition);
+ gtk_widget_size_request (scrolled_window->vscrollbar,
+ &vscrollbar_requisition);
+
+ if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
- gtk_widget_size_request (scrolled_window->viewport, &scrolled_window->viewport->requisition);
+ static guint quark_aux_info = 0;
- requisition->width += scrolled_window->viewport->requisition.width;
- requisition->height += scrolled_window->viewport->requisition.height;
- }
+ if (!quark_aux_info)
+ quark_aux_info = g_quark_from_static_string ("gtk-aux-info");
- extra_width = 0;
- extra_height = 0;
+ gtk_widget_size_request (bin->child, &child_requisition);
+
+ if (scrolled_window->hscrollbar_policy == GTK_POLICY_NEVER)
+ requisition->width += child_requisition.width;
+ else
+ {
+ GtkWidgetAuxInfo *aux_info;
+
+ aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child), quark_aux_info);
+ if (aux_info && aux_info->width > 0)
+ {
+ requisition->width += aux_info->width;
+ extra_width = -1;
+ }
+ else
+ requisition->width += vscrollbar_requisition.width;
+ }
- if ((scrolled_window->hscrollbar_policy == GTK_POLICY_AUTOMATIC) ||
+ if (scrolled_window->vscrollbar_policy == GTK_POLICY_NEVER)
+ requisition->height += child_requisition.height;
+ else
+ {
+ GtkWidgetAuxInfo *aux_info;
+
+ aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child), quark_aux_info);
+ if (aux_info && aux_info->height > 0)
+ {
+ requisition->height += aux_info->height;
+ extra_height = -1;
+ }
+ else
+ requisition->height += hscrollbar_requisition.height;
+ }
+ }
+
+ if (scrolled_window->hscrollbar_policy == GTK_POLICY_AUTOMATIC ||
GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
{
- gtk_widget_size_request (scrolled_window->hscrollbar,
- &scrolled_window->hscrollbar->requisition);
-
- requisition->width = MAX (requisition->width, scrolled_window->hscrollbar->requisition.width);
- extra_height = SCROLLBAR_SPACING (scrolled_window) + scrolled_window->hscrollbar->requisition.height;
+ requisition->width = MAX (requisition->width, hscrollbar_requisition.width);
+ if (!extra_height || GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
+ extra_height = SCROLLBAR_SPACING (scrolled_window) + hscrollbar_requisition.height;
}
- if ((scrolled_window->vscrollbar_policy == GTK_POLICY_AUTOMATIC) ||
+ if (scrolled_window->vscrollbar_policy == GTK_POLICY_AUTOMATIC ||
GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
{
- gtk_widget_size_request (scrolled_window->vscrollbar,
- &scrolled_window->vscrollbar->requisition);
-
- requisition->height = MAX (requisition->height, scrolled_window->vscrollbar->requisition.height);
- extra_width = SCROLLBAR_SPACING (scrolled_window) + scrolled_window->vscrollbar->requisition.width;
+ requisition->height = MAX (requisition->height, vscrollbar_requisition.height);
+ if (!extra_width || GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
+ extra_width = SCROLLBAR_SPACING (scrolled_window) + vscrollbar_requisition.width;
}
- requisition->width += GTK_CONTAINER (widget)->border_width * 2 + extra_width;
- requisition->height += GTK_CONTAINER (widget)->border_width * 2 + extra_height;
+ requisition->width += GTK_CONTAINER (widget)->border_width * 2 + MAX (0, extra_width);
+ requisition->height += GTK_CONTAINER (widget)->border_width * 2 + MAX (0, extra_height);
+}
+
+static void
+gtk_scrolled_window_relative_allocation (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GtkScrolledWindow *scrolled_window;
+
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (allocation != NULL);
+
+ scrolled_window = GTK_SCROLLED_WINDOW (widget);
+
+ allocation->x = GTK_CONTAINER (widget)->border_width;
+ allocation->y = GTK_CONTAINER (widget)->border_width;
+ allocation->width = MAX (1, (gint)widget->allocation.width - allocation->x * 2);
+ allocation->height = MAX (1, (gint)widget->allocation.height - allocation->y * 2);
+
+ if (scrolled_window->vscrollbar_visible)
+ {
+ GtkRequisition vscrollbar_requisition;
+ gtk_widget_get_child_requisition (scrolled_window->vscrollbar,
+ &vscrollbar_requisition);
+
+ if (scrolled_window->window_placement == GTK_CORNER_TOP_RIGHT ||
+ scrolled_window->window_placement == GTK_CORNER_BOTTOM_RIGHT)
+ allocation->x += (vscrollbar_requisition.width +
+ SCROLLBAR_SPACING (scrolled_window));
+
+ allocation->width = MAX (1, (gint)allocation->width -
+ ((gint)vscrollbar_requisition.width +
+ (gint)SCROLLBAR_SPACING (scrolled_window)));
+ }
+ if (scrolled_window->hscrollbar_visible)
+ {
+ GtkRequisition hscrollbar_requisition;
+ gtk_widget_get_child_requisition (scrolled_window->hscrollbar,
+ &hscrollbar_requisition);
+
+ if (scrolled_window->window_placement == GTK_CORNER_BOTTOM_LEFT ||
+ scrolled_window->window_placement == GTK_CORNER_BOTTOM_RIGHT)
+ allocation->y += (hscrollbar_requisition.height +
+ SCROLLBAR_SPACING (scrolled_window));
+
+ allocation->height = MAX (1, (gint)allocation->height -
+ ((gint)hscrollbar_requisition.height +
+ (gint)SCROLLBAR_SPACING (scrolled_window)));
+ }
}
static void
GtkAllocation *allocation)
{
GtkScrolledWindow *scrolled_window;
- GtkAllocation viewport_allocation;
+ GtkBin *bin;
+ GtkAllocation relative_allocation;
GtkAllocation child_allocation;
- guint previous_hvis;
- guint previous_vvis;
- gint count;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
g_return_if_fail (allocation != NULL);
scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ bin = GTK_BIN (scrolled_window);
+
widget->allocation = *allocation;
if (scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS)
scrolled_window->hscrollbar_visible = TRUE;
+ else if (scrolled_window->hscrollbar_policy == GTK_POLICY_NEVER)
+ scrolled_window->hscrollbar_visible = FALSE;
if (scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS)
scrolled_window->vscrollbar_visible = TRUE;
+ else if (scrolled_window->vscrollbar_policy == GTK_POLICY_NEVER)
+ scrolled_window->vscrollbar_visible = FALSE;
- if (GTK_WIDGET_VISIBLE (scrolled_window->viewport))
+ if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
- count = 0;
-
- do {
- gtk_scrolled_window_viewport_allocate (widget, &viewport_allocation);
-
- child_allocation.x = viewport_allocation.x + allocation->x;
- child_allocation.y = viewport_allocation.y + allocation->y;
- child_allocation.width = viewport_allocation.width;
- child_allocation.height = viewport_allocation.height;
-
- previous_hvis = scrolled_window->hscrollbar_visible;
- previous_vvis = scrolled_window->vscrollbar_visible;
-
- gtk_widget_size_allocate (scrolled_window->viewport, &child_allocation);
- /* If, after the first iteration, the hscrollbar and the
- * vscrollbar flip visiblity, then we need both.
- */
- if ((count++) &&
- (previous_hvis != scrolled_window->hscrollbar_visible) &&
- (previous_vvis != scrolled_window->vscrollbar_visible))
- {
- scrolled_window->hscrollbar_visible = TRUE;
- scrolled_window->vscrollbar_visible = TRUE;
- break;
- }
-
- count++;
- } while ((previous_hvis != scrolled_window->hscrollbar_visible) ||
- (previous_vvis != scrolled_window->vscrollbar_visible));
+ gboolean previous_hvis;
+ gboolean previous_vvis;
+ guint count = 0;
+
+ do
+ {
+ gtk_scrolled_window_relative_allocation (widget, &relative_allocation);
+
+ child_allocation.x = relative_allocation.x + allocation->x;
+ child_allocation.y = relative_allocation.y + allocation->y;
+ child_allocation.width = relative_allocation.width;
+ child_allocation.height = relative_allocation.height;
+
+ previous_hvis = scrolled_window->hscrollbar_visible;
+ previous_vvis = scrolled_window->vscrollbar_visible;
+
+ gtk_widget_size_allocate (bin->child, &child_allocation);
+
+ /* If, after the first iteration, the hscrollbar and the
+ * vscrollbar flip visiblity, then we need both.
+ */
+ if (count &&
+ previous_hvis != scrolled_window->hscrollbar_visible &&
+ previous_vvis != scrolled_window->vscrollbar_visible)
+ {
+ scrolled_window->hscrollbar_visible = TRUE;
+ scrolled_window->vscrollbar_visible = TRUE;
+
+ /* a new resize is already queued at this point,
+ * so we will immediatedly get reinvoked
+ */
+ return;
+ }
+
+ count++;
+ }
+ while (previous_hvis != scrolled_window->hscrollbar_visible ||
+ previous_vvis != scrolled_window->vscrollbar_visible);
}
-
+ else
+ gtk_scrolled_window_relative_allocation (widget, &relative_allocation);
+
if (scrolled_window->hscrollbar_visible)
{
+ GtkRequisition hscrollbar_requisition;
+ gtk_widget_get_child_requisition (scrolled_window->hscrollbar,
+ &hscrollbar_requisition);
+
if (!GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
gtk_widget_show (scrolled_window->hscrollbar);
- child_allocation.x = viewport_allocation.x;
- child_allocation.y = viewport_allocation.y + viewport_allocation.height + SCROLLBAR_SPACING (scrolled_window);
- child_allocation.width = viewport_allocation.width;
- child_allocation.height = scrolled_window->hscrollbar->requisition.height;
+ child_allocation.x = relative_allocation.x;
+ if (scrolled_window->window_placement == GTK_CORNER_TOP_LEFT ||
+ scrolled_window->window_placement == GTK_CORNER_TOP_RIGHT)
+ child_allocation.y = (relative_allocation.y +
+ relative_allocation.height +
+ SCROLLBAR_SPACING (scrolled_window));
+ else
+ child_allocation.y = GTK_CONTAINER (scrolled_window)->border_width;
+
+ child_allocation.width = relative_allocation.width;
+ child_allocation.height = hscrollbar_requisition.height;
child_allocation.x += allocation->x;
child_allocation.y += allocation->y;
gtk_widget_size_allocate (scrolled_window->hscrollbar, &child_allocation);
}
- else
- {
- if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
- gtk_widget_hide (scrolled_window->hscrollbar);
- }
+ else if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
+ gtk_widget_hide (scrolled_window->hscrollbar);
if (scrolled_window->vscrollbar_visible)
{
+ GtkRequisition vscrollbar_requisition;
if (!GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
gtk_widget_show (scrolled_window->vscrollbar);
- child_allocation.x = viewport_allocation.x + viewport_allocation.width + SCROLLBAR_SPACING (scrolled_window);
- child_allocation.y = viewport_allocation.y;
- child_allocation.width = scrolled_window->vscrollbar->requisition.width;
- child_allocation.height = viewport_allocation.height;
+ gtk_widget_get_child_requisition (scrolled_window->vscrollbar,
+ &vscrollbar_requisition);
+
+ if (scrolled_window->window_placement == GTK_CORNER_TOP_LEFT ||
+ scrolled_window->window_placement == GTK_CORNER_BOTTOM_LEFT)
+ child_allocation.x = (relative_allocation.x +
+ relative_allocation.width +
+ SCROLLBAR_SPACING (scrolled_window));
+ else
+ child_allocation.x = GTK_CONTAINER (scrolled_window)->border_width;
+
+ child_allocation.y = relative_allocation.y;
+ child_allocation.width = vscrollbar_requisition.width;
+ child_allocation.height = relative_allocation.height;
child_allocation.x += allocation->x;
child_allocation.y += allocation->y;
gtk_widget_size_allocate (scrolled_window->vscrollbar, &child_allocation);
}
- else
- {
- if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
- gtk_widget_hide (scrolled_window->vscrollbar);
- }
+ else if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
+ gtk_widget_hide (scrolled_window->vscrollbar);
}
-static void
-gtk_scrolled_window_add (GtkContainer *container,
- GtkWidget *widget)
-{
- GtkScrolledWindow *scrolled_window;
-
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container));
- g_return_if_fail (widget != NULL);
-
- scrolled_window = GTK_SCROLLED_WINDOW (container);
- gtk_container_add (GTK_CONTAINER (scrolled_window->viewport), widget);
-}
static void
-gtk_scrolled_window_remove (GtkContainer *container,
- GtkWidget *widget)
+gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
+ gpointer data)
{
- GtkScrolledWindow *scrolled_window;
+ GtkScrolledWindow *scrolled_win;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container));
- g_return_if_fail (widget != NULL);
+ g_return_if_fail (adjustment != NULL);
+ g_return_if_fail (data != NULL);
- scrolled_window = GTK_SCROLLED_WINDOW (container);
+ scrolled_win = GTK_SCROLLED_WINDOW (data);
- if (scrolled_window->viewport == widget ||
- scrolled_window->hscrollbar == widget ||
- scrolled_window->vscrollbar == widget)
+ if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->hscrollbar)))
{
- /* this happens during destroy */
- gtk_widget_unparent (widget);
+ if (scrolled_win->hscrollbar_policy == GTK_POLICY_AUTOMATIC)
+ {
+ gboolean visible;
+
+ visible = scrolled_win->hscrollbar_visible;
+ scrolled_win->hscrollbar_visible = (adjustment->upper - adjustment->lower >
+ adjustment->page_size);
+ if (scrolled_win->hscrollbar_visible != visible)
+ gtk_widget_queue_resize (GTK_WIDGET (scrolled_win));
+ }
+ }
+ else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->vscrollbar)))
+ {
+ if (scrolled_win->vscrollbar_policy == GTK_POLICY_AUTOMATIC)
+ {
+ gboolean visible;
+
+ visible = scrolled_win->vscrollbar_visible;
+ scrolled_win->vscrollbar_visible = (adjustment->upper - adjustment->lower >
+ adjustment->page_size);
+ if (scrolled_win->vscrollbar_visible != visible)
+ gtk_widget_queue_resize (GTK_WIDGET (scrolled_win));
+ }
}
- else
- gtk_container_remove (GTK_CONTAINER (scrolled_window->viewport), widget);
}
static void
-gtk_scrolled_window_foreach (GtkContainer *container,
- GtkCallback callback,
- gpointer callback_data)
+gtk_scrolled_window_add (GtkContainer *container,
+ GtkWidget *child)
{
GtkScrolledWindow *scrolled_window;
+ GtkBin *bin;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container));
- g_return_if_fail (callback != NULL);
+ bin = GTK_BIN (container);
+ g_return_if_fail (bin->child == NULL);
scrolled_window = GTK_SCROLLED_WINDOW (container);
- if (scrolled_window->viewport)
- (* callback) (scrolled_window->viewport, callback_data);
+ gtk_widget_set_parent (child, GTK_WIDGET (bin));
+ bin->child = child;
- (* callback) (scrolled_window->vscrollbar, callback_data);
- (* callback) (scrolled_window->hscrollbar, callback_data);
-}
+ /* this is a temporary message */
+ if (!gtk_widget_set_scroll_adjustments (child,
+ gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)),
+ gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar))))
+ g_warning ("gtk_scrolled_window_add(): cannot add non scrollable widget "
+ "use gtk_scrolled_window_add_with_viewport() instead");
-static void
-gtk_scrolled_window_viewport_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GtkScrolledWindow *scrolled_window;
+ if (GTK_WIDGET_VISIBLE (child->parent))
+ {
+ if (GTK_WIDGET_REALIZED (child->parent) &&
+ !GTK_WIDGET_REALIZED (child))
+ gtk_widget_realize (child);
- g_return_if_fail (widget != NULL);
- g_return_if_fail (allocation != NULL);
+ if (GTK_WIDGET_MAPPED (child->parent) &&
+ !GTK_WIDGET_MAPPED (child))
+ gtk_widget_map (child);
+ }
- scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (container))
+ gtk_widget_queue_resize (child);
+}
- allocation->x = GTK_CONTAINER (widget)->border_width;
- allocation->y = GTK_CONTAINER (widget)->border_width;
- allocation->width = MAX (1, widget->allocation.width - allocation->x * 2);
- allocation->height = MAX (1, widget->allocation.height - allocation->y * 2);
+static void
+gtk_scrolled_window_remove (GtkContainer *container,
+ GtkWidget *child)
+{
+ g_return_if_fail (container != NULL);
+ g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container));
+ g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_BIN (container)->child == child);
+
+ gtk_widget_set_scroll_adjustments (child, NULL, NULL);
- if (scrolled_window->vscrollbar_visible)
- allocation->width = MAX (1,
- allocation->width - (scrolled_window->vscrollbar->requisition.width + SCROLLBAR_SPACING (scrolled_window)));
- if (scrolled_window->hscrollbar_visible)
- allocation->height = MAX (1,
- allocation->height - (scrolled_window->hscrollbar->requisition.height + SCROLLBAR_SPACING (scrolled_window)));
+ /* chain parent class handler to remove child */
+ GTK_CONTAINER_CLASS (parent_class)->remove (container, child);
}
-static void
-gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
- gpointer data)
+void
+gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
+ GtkWidget *child)
{
- GtkScrolledWindow *scrolled_win;
+ GtkBin *bin;
+ GtkWidget *viewport;
- g_return_if_fail (adjustment != NULL);
- g_return_if_fail (data != NULL);
+ g_return_if_fail (scrolled_window != NULL);
+ g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
+ g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
+ g_return_if_fail (child->parent == NULL);
- scrolled_win = GTK_SCROLLED_WINDOW (data);
+ bin = GTK_BIN (scrolled_window);
- if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->hscrollbar)))
- {
- if (scrolled_win->hscrollbar_policy == GTK_POLICY_AUTOMATIC)
- {
- scrolled_win->hscrollbar_visible =
- ((adjustment->upper - adjustment->lower) > adjustment->page_size);
- }
- }
- else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->vscrollbar)))
+ if (bin->child != NULL)
{
- if (scrolled_win->vscrollbar_policy == GTK_POLICY_AUTOMATIC)
- {
- scrolled_win->vscrollbar_visible =
- ((adjustment->upper - adjustment->lower) > adjustment->page_size);
- }
+ g_return_if_fail (GTK_IS_VIEWPORT (bin->child));
+ g_return_if_fail (GTK_BIN (bin->child)->child == NULL);
+
+ viewport = bin->child;
}
else
{
- g_warning ("could not determine which adjustment scrollbar received change signal for");
- return;
+ viewport =
+ gtk_viewport_new (gtk_scrolled_window_get_hadjustment (scrolled_window),
+ gtk_scrolled_window_get_vadjustment (scrolled_window));
+ gtk_container_add (GTK_CONTAINER (scrolled_window), viewport);
}
+
+ gtk_widget_show (viewport);
+ gtk_container_add (GTK_CONTAINER (viewport), child);
}
projects / ~andy / gtk / blobdiff