#include "config.h"
#include "gtkviewport.h"
+#include "gtksizerequest.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
-#include "gtkalias.h"
+
+
+/**
+ * SECTION:gtkviewport
+ * @Short_description: An adapter which makes widgets scrollable
+ * @Title: GtkViewport
+ * @See_also:#GtkScrolledWindow, #GtkAdjustment
+ *
+ * The #GtkViewport widget acts as an adaptor class, implementing
+ * scrollability for child widgets that lack their own scrolling
+ * capabilities. Use #GtkViewport to scroll child widgets such as
+ * #GtkTable, #GtkBox, and so on.
+ *
+ * If a widget has native scrolling abilities, such as #GtkTextView,
+ * #GtkTreeView or #GtkIconview, it can be added to a #GtkScrolledWindow
+ * with gtk_container_add(). If a widget does not, you must first add the
+ * widget to a #GtkViewport, then add the viewport to the scrolled window.
+ * The convenience function gtk_scrolled_window_add_with_viewport() does
+ * exactly this, so you can ignore the presence of the viewport.
+ */
+
+struct _GtkViewportPrivate
+{
+ GtkAdjustment *hadjustment;
+ GtkAdjustment *vadjustment;
+ GtkShadowType shadow_type;
+
+ GdkWindow *bin_window;
+ GdkWindow *view_window;
+};
enum {
PROP_0,
GdkEventExpose *event);
static void gtk_viewport_add (GtkContainer *container,
GtkWidget *widget);
-static void gtk_viewport_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
static void gtk_viewport_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
static void gtk_viewport_style_set (GtkWidget *widget,
GtkStyle *previous_style);
-G_DEFINE_TYPE (GtkViewport, gtk_viewport, GTK_TYPE_BIN)
+static void gtk_viewport_size_request_init (GtkSizeRequestIface *iface);
+static void gtk_viewport_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_viewport_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
+
+
+G_DEFINE_TYPE_WITH_CODE (GtkViewport, gtk_viewport, GTK_TYPE_BIN,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
+ gtk_viewport_size_request_init))
static void
gtk_viewport_class_init (GtkViewportClass *class)
widget_class->realize = gtk_viewport_realize;
widget_class->unrealize = gtk_viewport_unrealize;
widget_class->expose_event = gtk_viewport_expose;
- widget_class->size_request = gtk_viewport_size_request;
widget_class->size_allocate = gtk_viewport_size_allocate;
widget_class->style_set = gtk_viewport_style_set;
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT,
GTK_TYPE_ADJUSTMENT);
+
+ g_type_class_add_private (class, sizeof (GtkViewportPrivate));
}
static void
GValue *value,
GParamSpec *pspec)
{
- GtkViewport *viewport;
-
- viewport = GTK_VIEWPORT (object);
+ GtkViewport *viewport = GTK_VIEWPORT (object);
+ GtkViewportPrivate *priv = viewport->priv;
switch (prop_id)
{
case PROP_HADJUSTMENT:
- g_value_set_object (value, viewport->hadjustment);
+ g_value_set_object (value, priv->hadjustment);
break;
case PROP_VADJUSTMENT:
- g_value_set_object (value, viewport->vadjustment);
+ g_value_set_object (value, priv->vadjustment);
break;
case PROP_SHADOW_TYPE:
- g_value_set_enum (value, viewport->shadow_type);
+ g_value_set_enum (value, priv->shadow_type);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
static void
gtk_viewport_init (GtkViewport *viewport)
{
- GTK_WIDGET_UNSET_FLAGS (viewport, GTK_NO_WINDOW);
+ GtkViewportPrivate *priv;
+
+ viewport->priv = G_TYPE_INSTANCE_GET_PRIVATE (viewport,
+ GTK_TYPE_VIEWPORT,
+ GtkViewportPrivate);
+ priv = viewport->priv;
+
+ gtk_widget_set_has_window (GTK_WIDGET (viewport), TRUE);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (viewport), FALSE);
gtk_container_set_resize_mode (GTK_CONTAINER (viewport), GTK_RESIZE_QUEUE);
-
- viewport->shadow_type = GTK_SHADOW_IN;
- viewport->view_window = NULL;
- viewport->bin_window = NULL;
- viewport->hadjustment = NULL;
- viewport->vadjustment = NULL;
+
+ priv->shadow_type = GTK_SHADOW_IN;
+ priv->view_window = NULL;
+ priv->bin_window = NULL;
+ priv->hadjustment = NULL;
+ priv->vadjustment = NULL;
}
/**
#define ADJUSTMENT_POINTER(viewport, orientation) \
(((orientation) == GTK_ORIENTATION_HORIZONTAL) ? \
- &(viewport)->hadjustment : &(viewport)->vadjustment)
+ &(viewport)->priv->hadjustment : &(viewport)->priv->vadjustment)
static void
viewport_disconnect_adjustment (GtkViewport *viewport,
/**
* gtk_viewport_get_hadjustment:
* @viewport: a #GtkViewport.
- *
+ *
* Returns the horizontal adjustment of the viewport.
*
- * Return value: the horizontal adjustment of @viewport.
+ * Return value: (transfer none): the horizontal adjustment of @viewport.
**/
GtkAdjustment*
gtk_viewport_get_hadjustment (GtkViewport *viewport)
{
+ GtkViewportPrivate *priv;
+
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
- if (!viewport->hadjustment)
+ priv = viewport->priv;
+
+ if (!priv->hadjustment)
gtk_viewport_set_hadjustment (viewport, NULL);
- return viewport->hadjustment;
+ return priv->hadjustment;
}
/**
*
* Returns the vertical adjustment of the viewport.
*
- * Return value: the vertical adjustment of @viewport.
+ * Return value: (transfer none): the vertical adjustment of @viewport.
**/
GtkAdjustment*
gtk_viewport_get_vadjustment (GtkViewport *viewport)
{
+ GtkViewportPrivate *priv;
+
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
- if (!viewport->vadjustment)
+ priv = viewport->priv;
+
+ if (!priv->vadjustment)
gtk_viewport_set_vadjustment (viewport, NULL);
- return viewport->vadjustment;
+ return priv->vadjustment;
}
static void
viewport_get_view_allocation (GtkViewport *viewport,
GtkAllocation *view_allocation)
{
+ GtkViewportPrivate *priv = viewport->priv;
+ GtkStyle *style;
GtkWidget *widget = GTK_WIDGET (viewport);
- GtkAllocation *allocation = &widget->allocation;
- gint border_width = GTK_CONTAINER (viewport)->border_width;
-
+ GtkAllocation allocation;
+ guint border_width;
+
+ gtk_widget_get_allocation (widget, &allocation);
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (viewport));
+
view_allocation->x = 0;
view_allocation->y = 0;
- if (viewport->shadow_type != GTK_SHADOW_NONE)
+ if (priv->shadow_type != GTK_SHADOW_NONE)
{
- view_allocation->x = widget->style->xthickness;
- view_allocation->y = widget->style->ythickness;
+ style = gtk_widget_get_style (widget);
+ view_allocation->x = style->xthickness;
+ view_allocation->y = style->ythickness;
}
- view_allocation->width = MAX (1, allocation->width - view_allocation->x * 2 - border_width * 2);
- view_allocation->height = MAX (1, allocation->height - view_allocation->y * 2 - border_width * 2);
+ view_allocation->width = MAX (1, allocation.width - view_allocation->x * 2 - border_width * 2);
+ view_allocation->height = MAX (1, allocation.height - view_allocation->y * 2 - border_width * 2);
}
static void
GtkBin *bin = GTK_BIN (viewport);
GtkAllocation view_allocation;
GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
+ GtkWidget *child;
gdouble old_page_size;
gdouble old_upper;
gdouble old_value;
hadjustment->lower = 0;
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child))
{
GtkRequisition child_requisition;
-
- gtk_widget_get_child_requisition (bin->child, &child_requisition);
+
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (child),
+ &child_requisition, NULL);
hadjustment->upper = MAX (child_requisition.width, view_allocation.width);
}
else
GtkBin *bin = GTK_BIN (viewport);
GtkAllocation view_allocation;
GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
+ GtkWidget *child;
viewport_get_view_allocation (viewport, &view_allocation);
vadjustment->lower = 0;
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child))
{
- GtkRequisition child_requisition;
-
- gtk_widget_get_child_requisition (bin->child, &child_requisition);
- vadjustment->upper = MAX (child_requisition.height, view_allocation.height);
+ gint natural_height;
+
+ gtk_size_request_get_height_for_width (GTK_SIZE_REQUEST (child),
+ view_allocation.width,
+ NULL,
+ &natural_height);
+ vadjustment->upper = MAX (natural_height, view_allocation.height);
}
else
vadjustment->upper = view_allocation.height;
gtk_viewport_set_shadow_type (GtkViewport *viewport,
GtkShadowType type)
{
+ GtkViewportPrivate *priv;
+ GtkAllocation allocation;
+ GtkWidget *widget;
+
g_return_if_fail (GTK_IS_VIEWPORT (viewport));
- if ((GtkShadowType) viewport->shadow_type != type)
+ widget = GTK_WIDGET (viewport);
+ priv = viewport->priv;
+
+ if ((GtkShadowType) priv->shadow_type != type)
{
- viewport->shadow_type = type;
+ priv->shadow_type = type;
- if (GTK_WIDGET_VISIBLE (viewport))
+ if (gtk_widget_get_visible (widget))
{
- gtk_widget_size_allocate (GTK_WIDGET (viewport), &(GTK_WIDGET (viewport)->allocation));
- gtk_widget_queue_draw (GTK_WIDGET (viewport));
+ gtk_widget_get_allocation (widget, &allocation);
+ gtk_widget_size_allocate (widget, &allocation);
+ gtk_widget_set_allocation (widget, &allocation);
+ gtk_widget_queue_draw (widget);
}
g_object_notify (G_OBJECT (viewport), "shadow-type");
*
* Gets the shadow type of the #GtkViewport. See
* gtk_viewport_set_shadow_type().
-
+ *
* Return value: the shadow type
**/
GtkShadowType
{
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), GTK_SHADOW_NONE);
- return viewport->shadow_type;
+ return viewport->priv->shadow_type;
}
/**
*
* Gets the bin window of the #GtkViewport.
*
- * Return value: a #GdkWindow
+ * Return value: (transfer none): a #GdkWindow
*
* Since: 2.20
**/
{
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
- return viewport->bin_window;
+ return viewport->priv->bin_window;
+}
+
+/**
+ * gtk_viewport_get_view_window:
+ * @viewport: a #GtkViewport
+ *
+ * Gets the view window of the #GtkViewport.
+ *
+ * Return value: (transfer none): a #GdkWindow
+ *
+ * Since: 2.22
+ **/
+GdkWindow*
+gtk_viewport_get_view_window (GtkViewport *viewport)
+{
+ g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
+
+ return viewport->priv->view_window;
}
static void
gtk_viewport_realize (GtkWidget *widget)
{
GtkViewport *viewport = GTK_VIEWPORT (widget);
+ GtkViewportPrivate *priv = viewport->priv;
GtkBin *bin = GTK_BIN (widget);
GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
- gint border_width = GTK_CONTAINER (widget)->border_width;
-
+ GtkAllocation allocation;
GtkAllocation view_allocation;
+ GtkStyle *style;
+ GtkWidget *child;
+ GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
gint event_mask;
+ guint border_width;
+
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+ gtk_widget_set_realized (widget, TRUE);
- attributes.x = widget->allocation.x + border_width;
- attributes.y = widget->allocation.y + border_width;
- attributes.width = widget->allocation.width - border_width * 2;
- attributes.height = widget->allocation.height - border_width * 2;
+ gtk_widget_get_allocation (widget, &allocation);
+
+ attributes.x = allocation.x + border_width;
+ attributes.y = allocation.y + border_width;
+ attributes.width = allocation.width - border_width * 2;
+ attributes.height = allocation.height - border_width * 2;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
- &attributes, attributes_mask);
- gdk_window_set_user_data (widget->window, viewport);
+ 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, viewport);
viewport_get_view_allocation (viewport, &view_allocation);
attributes.height = view_allocation.height;
attributes.event_mask = 0;
- viewport->view_window = gdk_window_new (widget->window, &attributes, attributes_mask);
- gdk_window_set_user_data (viewport->view_window, viewport);
+ priv->view_window = gdk_window_new (window,
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (priv->view_window, viewport);
- gdk_window_set_back_pixmap (viewport->view_window, NULL, FALSE);
+ gdk_window_set_back_pixmap (priv->view_window, NULL, FALSE);
attributes.x = - hadjustment->value;
attributes.y = - vadjustment->value;
attributes.event_mask = event_mask;
- viewport->bin_window = gdk_window_new (viewport->view_window, &attributes, attributes_mask);
- gdk_window_set_user_data (viewport->bin_window, viewport);
+ priv->bin_window = gdk_window_new (priv->view_window, &attributes, attributes_mask);
+ gdk_window_set_user_data (priv->bin_window, viewport);
- if (bin->child)
- gtk_widget_set_parent_window (bin->child, viewport->bin_window);
+ child = gtk_bin_get_child (bin);
+ if (child)
+ gtk_widget_set_parent_window (child, priv->bin_window);
- widget->style = gtk_style_attach (widget->style, widget->window);
- gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
- gtk_style_set_background (widget->style, viewport->bin_window, GTK_STATE_NORMAL);
+ gtk_widget_style_attach (widget);
+ style = gtk_widget_get_style (widget);
+ gtk_style_set_background (style, window, GTK_STATE_NORMAL);
+ gtk_style_set_background (style, priv->bin_window, GTK_STATE_NORMAL);
/* Call paint here to allow a theme to set the background without flashing
*/
- gtk_paint_flat_box(widget->style, viewport->bin_window, GTK_STATE_NORMAL,
+ gtk_paint_flat_box(style, priv->bin_window, GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
NULL, widget, "viewportbin",
0, 0, -1, -1);
- gdk_window_show (viewport->bin_window);
- gdk_window_show (viewport->view_window);
+ gdk_window_show (priv->bin_window);
+ gdk_window_show (priv->view_window);
}
static void
gtk_viewport_unrealize (GtkWidget *widget)
{
GtkViewport *viewport = GTK_VIEWPORT (widget);
+ GtkViewportPrivate *priv = viewport->priv;
- gdk_window_set_user_data (viewport->view_window, NULL);
- gdk_window_destroy (viewport->view_window);
- viewport->view_window = NULL;
+ gdk_window_set_user_data (priv->view_window, NULL);
+ gdk_window_destroy (priv->view_window);
+ priv->view_window = NULL;
- gdk_window_set_user_data (viewport->bin_window, NULL);
- gdk_window_destroy (viewport->bin_window);
- viewport->bin_window = NULL;
+ gdk_window_set_user_data (priv->bin_window, NULL);
+ gdk_window_destroy (priv->bin_window);
+ priv->bin_window = NULL;
GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize (widget);
}
gtk_viewport_paint (GtkWidget *widget,
GdkRectangle *area)
{
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
GtkViewport *viewport = GTK_VIEWPORT (widget);
+ GtkViewportPrivate *priv = viewport->priv;
- gtk_paint_shadow (widget->style, widget->window,
- GTK_STATE_NORMAL, viewport->shadow_type,
+ gtk_paint_shadow (gtk_widget_get_style (widget),
+ gtk_widget_get_window (widget),
+ GTK_STATE_NORMAL, priv->shadow_type,
area, widget, "viewport",
0, 0, -1, -1);
}
{
GtkViewport *viewport;
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
{
viewport = GTK_VIEWPORT (widget);
+ GtkViewportPrivate *priv = viewport->priv;
- if (event->window == widget->window)
+ if (event->window == gtk_widget_get_window (widget))
gtk_viewport_paint (widget, &event->area);
- else if (event->window == viewport->bin_window)
+ else if (event->window == priv->bin_window)
{
- gtk_paint_flat_box(widget->style, viewport->bin_window,
+ gtk_paint_flat_box(gtk_widget_get_style (widget), priv->bin_window,
GTK_STATE_NORMAL, GTK_SHADOW_NONE,
&event->area, widget, "viewportbin",
0, 0, -1, -1);
GtkWidget *child)
{
GtkBin *bin = GTK_BIN (container);
+ GtkViewport *viewport = GTK_VIEWPORT (bin);
+ GtkViewportPrivate *priv = viewport->priv;
- g_return_if_fail (bin->child == NULL);
+ g_return_if_fail (gtk_bin_get_child (bin) == NULL);
- gtk_widget_set_parent_window (child, GTK_VIEWPORT (bin)->bin_window);
+ gtk_widget_set_parent_window (child, priv->bin_window);
GTK_CONTAINER_CLASS (gtk_viewport_parent_class)->add (container, child);
}
-static void
-gtk_viewport_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- GtkBin *bin = GTK_BIN (widget);
- GtkRequisition child_requisition;
-
- requisition->width = GTK_CONTAINER (widget)->border_width;
-
- requisition->height = GTK_CONTAINER (widget)->border_width;
-
- if (GTK_VIEWPORT (widget)->shadow_type != GTK_SHADOW_NONE)
- {
- requisition->width += 2 * widget->style->xthickness;
- requisition->height += 2 * widget->style->ythickness;
- }
-
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
- {
- gtk_widget_size_request (bin->child, &child_requisition);
- requisition->width += child_requisition.width;
- requisition->height += child_requisition.height;
- }
-}
-
static void
gtk_viewport_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
+ GtkAllocation widget_allocation;
GtkViewport *viewport = GTK_VIEWPORT (widget);
+ GtkViewportPrivate *priv = viewport->priv;
GtkBin *bin = GTK_BIN (widget);
- gint border_width = GTK_CONTAINER (widget)->border_width;
+ guint border_width;
gboolean hadjustment_value_changed, vadjustment_value_changed;
GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
GtkAllocation child_allocation;
+ GtkWidget *child;
+
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
/* If our size changed, and we have a shadow, queue a redraw on widget->window to
* redraw the shadow correctly.
*/
- if (GTK_WIDGET_MAPPED (widget) &&
- viewport->shadow_type != GTK_SHADOW_NONE &&
- (widget->allocation.width != allocation->width ||
- widget->allocation.height != allocation->height))
- gdk_window_invalidate_rect (widget->window, NULL, FALSE);
-
- widget->allocation = *allocation;
-
+ gtk_widget_get_allocation (widget, &widget_allocation);
+ if (gtk_widget_get_mapped (widget) &&
+ priv->shadow_type != GTK_SHADOW_NONE &&
+ (widget_allocation.width != allocation->width ||
+ widget_allocation.height != allocation->height))
+ gdk_window_invalidate_rect (gtk_widget_get_window (widget), NULL, FALSE);
+
+ gtk_widget_set_allocation (widget, allocation);
+
viewport_set_hadjustment_values (viewport, &hadjustment_value_changed);
viewport_set_vadjustment_values (viewport, &vadjustment_value_changed);
child_allocation.y = 0;
child_allocation.width = hadjustment->upper;
child_allocation.height = vadjustment->upper;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
GtkAllocation view_allocation;
- gdk_window_move_resize (widget->window,
+
+ gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x + border_width,
allocation->y + border_width,
allocation->width - border_width * 2,
allocation->height - border_width * 2);
viewport_get_view_allocation (viewport, &view_allocation);
- gdk_window_move_resize (viewport->view_window,
+ gdk_window_move_resize (priv->view_window,
view_allocation.x,
view_allocation.y,
view_allocation.width,
view_allocation.height);
- gdk_window_move_resize (viewport->bin_window,
+ gdk_window_move_resize (priv->bin_window,
- hadjustment->value,
- vadjustment->value,
child_allocation.width,
child_allocation.height);
}
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
- gtk_widget_size_allocate (bin->child, &child_allocation);
+
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child))
+ gtk_widget_size_allocate (child, &child_allocation);
gtk_adjustment_changed (hadjustment);
gtk_adjustment_changed (vadjustment);
gpointer data)
{
GtkViewport *viewport = GTK_VIEWPORT (data);
+ GtkViewportPrivate *priv = viewport->priv;
GtkBin *bin = GTK_BIN (data);
+ GtkWidget *child;
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child) &&
- GTK_WIDGET_REALIZED (viewport))
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child) &&
+ gtk_widget_get_realized (GTK_WIDGET (viewport)))
{
GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
gint old_x, old_y;
gint new_x, new_y;
- gdk_window_get_position (viewport->bin_window, &old_x, &old_y);
+ gdk_window_get_position (priv->bin_window, &old_x, &old_y);
new_x = - hadjustment->value;
new_y = - vadjustment->value;
if (new_x != old_x || new_y != old_y)
{
- gdk_window_move (viewport->bin_window, new_x, new_y);
- gdk_window_process_updates (viewport->bin_window, TRUE);
+ gdk_window_move (priv->bin_window, new_x, new_y);
+ gdk_window_process_updates (priv->bin_window, TRUE);
}
}
}
gtk_viewport_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
- if (GTK_WIDGET_REALIZED (widget) &&
- !GTK_WIDGET_NO_WINDOW (widget))
+ if (gtk_widget_get_realized (widget) &&
+ gtk_widget_get_has_window (widget))
{
+ GtkStyle *style;
GtkViewport *viewport = GTK_VIEWPORT (widget);
+ GtkViewportPrivate *priv = viewport->priv;
- gtk_style_set_background (widget->style, viewport->bin_window, GTK_STATE_NORMAL);
- gtk_style_set_background (widget->style, widget->window, widget->state);
+ style = gtk_widget_get_style (widget);
+ gtk_style_set_background (style, priv->bin_window, GTK_STATE_NORMAL);
+ gtk_style_set_background (style,
+ gtk_widget_get_window (widget),
+ gtk_widget_get_state (widget));
}
}
-#define __GTK_VIEWPORT_C__
-#include "gtkaliasdef.c"
+
+static void
+gtk_viewport_size_request_init (GtkSizeRequestIface *iface)
+{
+ iface->get_width = gtk_viewport_get_width;
+ iface->get_height = gtk_viewport_get_height;
+}
+
+static void
+gtk_viewport_get_size (GtkSizeRequest *widget,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkViewport *viewport = GTK_VIEWPORT (widget);
+ GtkViewportPrivate *priv = viewport->priv;
+ GtkStyle *style;
+ GtkWidget *child;
+ gint child_min, child_nat;
+ gint minimum, natural;
+
+ child = gtk_bin_get_child (GTK_BIN (widget));
+
+ /* XXX This should probably be (border_width * 2); but GTK+ has
+ * been doing this with a single border for a while now...
+ */
+ minimum = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+ if (priv->shadow_type != GTK_SHADOW_NONE)
+ {
+ style = gtk_widget_get_style (GTK_WIDGET (widget));
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ minimum += 2 * style->xthickness;
+ else
+ minimum += 2 * style->ythickness;
+ }
+
+ natural = minimum;
+
+ if (child && gtk_widget_get_visible (child))
+ {
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_size_request_get_width (GTK_SIZE_REQUEST (child), &child_min, &child_nat);
+ else
+ gtk_size_request_get_height (GTK_SIZE_REQUEST (child), &child_min, &child_nat);
+
+ minimum += child_min;
+ natural += child_nat;
+ }
+
+ if (minimum_size)
+ *minimum_size = minimum;
+
+ if (natural_size)
+ *natural_size = natural;
+}
+
+static void
+gtk_viewport_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_viewport_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
+}
+
+static void
+gtk_viewport_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_viewport_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+}
projects / ~andy / gtk / blobdiff