X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkframe.c;h=9b81631394c455e6d3adefe903861ab7a14d012c;hb=feb64f40b0f50735104da0a7fdafbe480763c180;hp=a8f40a0955c429e0d4bd4509c89b98197998def1;hpb=eacbe5e136e0e0b0709724cd6858522af4cf1d64;p=~andy%2Fgtk
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index a8f40a095..9b8163139 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -12,9 +12,7 @@
* 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 .
*/
/*
@@ -24,29 +22,81 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include
+#include "config.h"
#include
-#include "gtkalias.h"
#include "gtkframe.h"
#include "gtklabel.h"
+#include "gtkprivate.h"
+#include "gtktypebuiltins.h"
#include "gtkintl.h"
+#include "gtkbuildable.h"
+#include "gtkwidgetpath.h"
+
+#include "a11y/gtkframeaccessible.h"
+
+/**
+ * SECTION:gtkframe
+ * @Short_description: A bin with a decorative frame and optional label
+ * @Title: GtkFrame
+ *
+ * The frame widget is a Bin that surrounds its child
+ * with a decorative frame and an optional label.
+ * If present, the label is drawn in a gap in the
+ * top side of the frame. The position of the
+ * label can be controlled with gtk_frame_set_label_align().
+ *
+ *
+ * GtkFrame as GtkBuildable
+ *
+ * The GtkFrame implementation of the GtkBuildable interface
+ * supports placing a child in the label position by specifying
+ * "label" as the "type" attribute of a <child> element.
+ * A normal content child can be specified without specifying
+ * a <child> type attribute.
+ *
+ *
+ * A UI definition fragment with GtkFrame
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * ]]>
+ *
+ *
+ */
+
#define LABEL_PAD 1
#define LABEL_SIDE_PAD 2
+struct _GtkFramePrivate
+{
+ /* Properties */
+ GtkWidget *label_widget;
+
+ gint16 shadow_type;
+ gfloat label_xalign;
+ gfloat label_yalign;
+ /* Properties */
+
+ GtkAllocation child_allocation;
+ GtkAllocation label_allocation;
+};
+
enum {
PROP_0,
PROP_LABEL,
PROP_LABEL_XALIGN,
PROP_LABEL_YALIGN,
- PROP_SHADOW,
PROP_SHADOW_TYPE,
PROP_LABEL_WIDGET
};
-
-static void gtk_frame_class_init (GtkFrameClass *klass);
-static void gtk_frame_init (GtkFrame *frame);
static void gtk_frame_set_property (GObject *object,
guint param_id,
const GValue *value,
@@ -55,12 +105,8 @@ static void gtk_frame_get_property (GObject *object,
guint param_id,
GValue *value,
GParamSpec *pspec);
-static void gtk_frame_paint (GtkWidget *widget,
- GdkRectangle *area);
-static gint gtk_frame_expose (GtkWidget *widget,
- GdkEventExpose *event);
-static void gtk_frame_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
+static gboolean gtk_frame_draw (GtkWidget *widget,
+ cairo_t *cr);
static void gtk_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_frame_remove (GtkContainer *container,
@@ -69,41 +115,40 @@ static void gtk_frame_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
+static GtkWidgetPath * gtk_frame_get_path_for_child (GtkContainer *container,
+ GtkWidget *child);
static void gtk_frame_compute_child_allocation (GtkFrame *frame,
GtkAllocation *child_allocation);
static void gtk_frame_real_compute_child_allocation (GtkFrame *frame,
GtkAllocation *child_allocation);
-static GtkBinClass *parent_class = NULL;
-
-
-GType
-gtk_frame_get_type (void)
-{
- static GType frame_type = 0;
-
- if (!frame_type)
- {
- static const GTypeInfo frame_info =
- {
- sizeof (GtkFrameClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_frame_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkFrame),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_frame_init,
- };
-
- frame_type = g_type_register_static (GTK_TYPE_BIN, "GtkFrame",
- &frame_info, 0);
- }
-
- return frame_type;
-}
+/* GtkBuildable */
+static void gtk_frame_buildable_init (GtkBuildableIface *iface);
+static void gtk_frame_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type);
+
+static void gtk_frame_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_frame_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_frame_get_preferred_height_for_width(GtkWidget *layout,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height);
+static void gtk_frame_get_preferred_width_for_height(GtkWidget *layout,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height);
+
+
+G_DEFINE_TYPE_WITH_CODE (GtkFrame, gtk_frame, GTK_TYPE_BIN,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+ gtk_frame_buildable_init))
static void
gtk_frame_class_init (GtkFrameClass *class)
@@ -116,8 +161,6 @@ gtk_frame_class_init (GtkFrameClass *class)
widget_class = GTK_WIDGET_CLASS (class);
container_class = GTK_CONTAINER_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
-
gobject_class->set_property = gtk_frame_set_property;
gobject_class->get_property = gtk_frame_get_property;
@@ -127,69 +170,99 @@ gtk_frame_class_init (GtkFrameClass *class)
P_("Label"),
P_("Text of the frame's label"),
NULL,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE));
+ GTK_PARAM_READABLE |
+ GTK_PARAM_WRITABLE));
g_object_class_install_property (gobject_class,
PROP_LABEL_XALIGN,
- g_param_spec_float ("label_xalign",
+ g_param_spec_float ("label-xalign",
P_("Label xalign"),
P_("The horizontal alignment of the label"),
0.0,
1.0,
- 0.5,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE));
+ 0.0,
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_LABEL_YALIGN,
- g_param_spec_float ("label_yalign",
+ g_param_spec_float ("label-yalign",
P_("Label yalign"),
P_("The vertical alignment of the label"),
0.0,
1.0,
0.5,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE));
- g_object_class_install_property (gobject_class,
- PROP_SHADOW,
- g_param_spec_enum ("shadow", NULL,
- P_("Deprecated property, use shadow_type instead"),
- GTK_TYPE_SHADOW_TYPE,
- GTK_SHADOW_ETCHED_IN,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_SHADOW_TYPE,
- g_param_spec_enum ("shadow_type",
+ g_param_spec_enum ("shadow-type",
P_("Frame shadow"),
P_("Appearance of the frame border"),
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_ETCHED_IN,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_LABEL_WIDGET,
- g_param_spec_object ("label_widget",
+ g_param_spec_object ("label-widget",
P_("Label widget"),
P_("A widget to display in place of the usual frame label"),
GTK_TYPE_WIDGET,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
-
- widget_class->expose_event = gtk_frame_expose;
- widget_class->size_request = gtk_frame_size_request;
- widget_class->size_allocate = gtk_frame_size_allocate;
+ GTK_PARAM_READWRITE));
+
+ widget_class->draw = gtk_frame_draw;
+ widget_class->size_allocate = gtk_frame_size_allocate;
+ widget_class->get_preferred_width = gtk_frame_get_preferred_width;
+ widget_class->get_preferred_height = gtk_frame_get_preferred_height;
+ widget_class->get_preferred_height_for_width = gtk_frame_get_preferred_height_for_width;
+ widget_class->get_preferred_width_for_height = gtk_frame_get_preferred_width_for_height;
container_class->remove = gtk_frame_remove;
container_class->forall = gtk_frame_forall;
+ container_class->get_path_for_child = gtk_frame_get_path_for_child;
class->compute_child_allocation = gtk_frame_real_compute_child_allocation;
+
+ g_type_class_add_private (class, sizeof (GtkFramePrivate));
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FRAME_ACCESSIBLE);
+}
+
+static void
+gtk_frame_buildable_init (GtkBuildableIface *iface)
+{
+ iface->add_child = gtk_frame_buildable_add_child;
+}
+
+static void
+gtk_frame_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
+{
+ if (type && strcmp (type, "label") == 0)
+ gtk_frame_set_label_widget (GTK_FRAME (buildable), GTK_WIDGET (child));
+ else if (!type)
+ gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
+ else
+ GTK_BUILDER_WARN_INVALID_CHILD_TYPE (GTK_FRAME (buildable), type);
}
static void
gtk_frame_init (GtkFrame *frame)
{
- frame->label_widget = NULL;
- frame->shadow_type = GTK_SHADOW_ETCHED_IN;
- frame->label_xalign = 0.0;
- frame->label_yalign = 0.5;
+ GtkFramePrivate *priv;
+ GtkStyleContext *context;
+
+ frame->priv = G_TYPE_INSTANCE_GET_PRIVATE (frame,
+ GTK_TYPE_FRAME,
+ GtkFramePrivate);
+ priv = frame->priv;
+
+ priv->label_widget = NULL;
+ priv->shadow_type = GTK_SHADOW_ETCHED_IN;
+ priv->label_xalign = 0.0;
+ priv->label_yalign = 0.5;
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (frame));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME);
}
static void
@@ -198,9 +271,8 @@ gtk_frame_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- GtkFrame *frame;
-
- frame = GTK_FRAME (object);
+ GtkFrame *frame = GTK_FRAME (object);
+ GtkFramePrivate *priv = frame->priv;
switch (prop_id)
{
@@ -209,13 +281,12 @@ gtk_frame_set_property (GObject *object,
break;
case PROP_LABEL_XALIGN:
gtk_frame_set_label_align (frame, g_value_get_float (value),
- frame->label_yalign);
+ priv->label_yalign);
break;
case PROP_LABEL_YALIGN:
- gtk_frame_set_label_align (frame, frame->label_xalign,
+ gtk_frame_set_label_align (frame, priv->label_xalign,
g_value_get_float (value));
break;
- case PROP_SHADOW:
case PROP_SHADOW_TYPE:
gtk_frame_set_shadow_type (frame, g_value_get_enum (value));
break;
@@ -234,9 +305,8 @@ gtk_frame_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- GtkFrame *frame;
-
- frame = GTK_FRAME (object);
+ GtkFrame *frame = GTK_FRAME (object);
+ GtkFramePrivate *priv = frame->priv;
switch (prop_id)
{
@@ -244,19 +314,18 @@ gtk_frame_get_property (GObject *object,
g_value_set_string (value, gtk_frame_get_label (frame));
break;
case PROP_LABEL_XALIGN:
- g_value_set_float (value, frame->label_xalign);
+ g_value_set_float (value, priv->label_xalign);
break;
case PROP_LABEL_YALIGN:
- g_value_set_float (value, frame->label_yalign);
+ g_value_set_float (value, priv->label_yalign);
break;
- case PROP_SHADOW:
case PROP_SHADOW_TYPE:
- g_value_set_enum (value, frame->shadow_type);
+ g_value_set_enum (value, priv->shadow_type);
break;
case PROP_LABEL_WIDGET:
g_value_set_object (value,
- frame->label_widget ?
- G_OBJECT (frame->label_widget) : NULL);
+ priv->label_widget ?
+ G_OBJECT (priv->label_widget) : NULL);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -284,11 +353,12 @@ gtk_frame_remove (GtkContainer *container,
GtkWidget *child)
{
GtkFrame *frame = GTK_FRAME (container);
+ GtkFramePrivate *priv = frame->priv;
- if (frame->label_widget == child)
+ if (priv->label_widget == child)
gtk_frame_set_label_widget (frame, NULL);
else
- GTK_CONTAINER_CLASS (parent_class)->remove (container, child);
+ GTK_CONTAINER_CLASS (gtk_frame_parent_class)->remove (container, child);
}
static void
@@ -299,19 +369,39 @@ gtk_frame_forall (GtkContainer *container,
{
GtkBin *bin = GTK_BIN (container);
GtkFrame *frame = GTK_FRAME (container);
+ GtkFramePrivate *priv = frame->priv;
+ GtkWidget *child;
+
+ child = gtk_bin_get_child (bin);
+ if (child)
+ (* callback) (child, callback_data);
+
+ if (priv->label_widget)
+ (* callback) (priv->label_widget, callback_data);
+}
+
+static GtkWidgetPath *
+gtk_frame_get_path_for_child (GtkContainer *container,
+ GtkWidget *child)
+{
+ GtkFramePrivate *priv = GTK_FRAME (container)->priv;
+ GtkWidgetPath *path;
+
+ path = GTK_CONTAINER_CLASS (gtk_frame_parent_class)->get_path_for_child (container, child);
- if (bin->child)
- (* callback) (bin->child, callback_data);
+ if (child == priv->label_widget)
+ gtk_widget_path_iter_add_class (path,
+ gtk_widget_path_length (path) - 2,
+ GTK_STYLE_CLASS_FRAME);
- if (frame->label_widget)
- (* callback) (frame->label_widget, callback_data);
+ return path;
}
/**
* gtk_frame_set_label:
* @frame: a #GtkFrame
- * @label: the text to use as the label of the frame
- *
+ * @label: (allow-none): the text to use as the label of the frame
+ *
* Sets the text of the label. If @label is %NULL,
* the current label is removed.
**/
@@ -348,13 +438,17 @@ gtk_frame_set_label (GtkFrame *frame,
* a #GtkLabel. This string is owned by GTK+ and
* must not be modified or freed.
**/
-G_CONST_RETURN gchar *
+const gchar *
gtk_frame_get_label (GtkFrame *frame)
{
+ GtkFramePrivate *priv;
+
g_return_val_if_fail (GTK_IS_FRAME (frame), NULL);
- if (frame->label_widget && GTK_IS_LABEL (frame->label_widget))
- return gtk_label_get_text (GTK_LABEL (frame->label_widget));
+ priv = frame->priv;
+
+ if (GTK_IS_LABEL (priv->label_widget))
+ return gtk_label_get_text (GTK_LABEL (priv->label_widget));
else
return NULL;
}
@@ -372,35 +466,38 @@ void
gtk_frame_set_label_widget (GtkFrame *frame,
GtkWidget *label_widget)
{
+ GtkFramePrivate *priv;
gboolean need_resize = FALSE;
-
+
g_return_if_fail (GTK_IS_FRAME (frame));
g_return_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget));
- g_return_if_fail (label_widget == NULL || label_widget->parent == NULL);
-
- if (frame->label_widget == label_widget)
+ g_return_if_fail (label_widget == NULL || gtk_widget_get_parent (label_widget) == NULL);
+
+ priv = frame->priv;
+
+ if (priv->label_widget == label_widget)
return;
-
- if (frame->label_widget)
+
+ if (priv->label_widget)
{
- need_resize = GTK_WIDGET_VISIBLE (frame->label_widget);
- gtk_widget_unparent (frame->label_widget);
+ need_resize = gtk_widget_get_visible (priv->label_widget);
+ gtk_widget_unparent (priv->label_widget);
}
- frame->label_widget = label_widget;
-
+ priv->label_widget = label_widget;
+
if (label_widget)
{
- frame->label_widget = label_widget;
+ priv->label_widget = label_widget;
gtk_widget_set_parent (label_widget, GTK_WIDGET (frame));
- need_resize |= GTK_WIDGET_VISIBLE (label_widget);
+ need_resize |= gtk_widget_get_visible (label_widget);
}
-
- if (GTK_WIDGET_VISIBLE (frame) && need_resize)
+
+ if (gtk_widget_get_visible (GTK_WIDGET (frame)) && need_resize)
gtk_widget_queue_resize (GTK_WIDGET (frame));
g_object_freeze_notify (G_OBJECT (frame));
- g_object_notify (G_OBJECT (frame), "label_widget");
+ g_object_notify (G_OBJECT (frame), "label-widget");
g_object_notify (G_OBJECT (frame), "label");
g_object_thaw_notify (G_OBJECT (frame));
}
@@ -412,14 +509,14 @@ gtk_frame_set_label_widget (GtkFrame *frame,
* Retrieves the label widget for the frame. See
* gtk_frame_set_label_widget().
*
- * Return value: the label widget, or %NULL if there is none.
+ * Return value: (transfer none): the label widget, or %NULL if there is none.
**/
GtkWidget *
gtk_frame_get_label_widget (GtkFrame *frame)
{
g_return_val_if_fail (GTK_IS_FRAME (frame), NULL);
- return frame->label_widget;
+ return frame->priv->label_widget;
}
/**
@@ -429,7 +526,9 @@ gtk_frame_get_label_widget (GtkFrame *frame)
* of the widget. A value of 0.0 represents left alignment;
* 1.0 represents right alignment.
* @yalign: The y alignment of the label. A value of 0.0 aligns under
- * the frame; 1.0 aligns above the frame.
+ * the frame; 1.0 aligns above the frame. If the values are exactly
+ * 0.0 or 1.0 the gap in the frame won't be painted because the label
+ * will be completely above or below the frame.
*
* Sets the alignment of the frame widget's label. The
* default values for a newly created frame are 0.0 and 0.5.
@@ -439,22 +538,26 @@ gtk_frame_set_label_align (GtkFrame *frame,
gfloat xalign,
gfloat yalign)
{
+ GtkFramePrivate *priv;
+
g_return_if_fail (GTK_IS_FRAME (frame));
+ priv = frame->priv;
+
xalign = CLAMP (xalign, 0.0, 1.0);
yalign = CLAMP (yalign, 0.0, 1.0);
g_object_freeze_notify (G_OBJECT (frame));
- if (xalign != frame->label_xalign)
+ if (xalign != priv->label_xalign)
{
- frame->label_xalign = xalign;
- g_object_notify (G_OBJECT (frame), "label_xalign");
+ priv->label_xalign = xalign;
+ g_object_notify (G_OBJECT (frame), "label-xalign");
}
- if (yalign != frame->label_yalign)
+ if (yalign != priv->label_yalign)
{
- frame->label_yalign = yalign;
- g_object_notify (G_OBJECT (frame), "label_yalign");
+ priv->label_yalign = yalign;
+ g_object_notify (G_OBJECT (frame), "label-yalign");
}
g_object_thaw_notify (G_OBJECT (frame));
@@ -464,8 +567,10 @@ gtk_frame_set_label_align (GtkFrame *frame,
/**
* gtk_frame_get_label_align:
* @frame: a #GtkFrame
- * @xalign: location to store X alignment of frame's label, or %NULL
- * @yalign: location to store X alignment of frame's label, or %NULL
+ * @xalign: (out) (allow-none): location to store X alignment of
+ * frame's label, or %NULL
+ * @yalign: (out) (allow-none): location to store X alignment of
+ * frame's label, or %NULL
*
* Retrieves the X and Y alignment of the frame's label. See
* gtk_frame_set_label_align().
@@ -475,12 +580,16 @@ gtk_frame_get_label_align (GtkFrame *frame,
gfloat *xalign,
gfloat *yalign)
{
+ GtkFramePrivate *priv;
+
g_return_if_fail (GTK_IS_FRAME (frame));
+ priv = frame->priv;
+
if (xalign)
- *xalign = frame->label_xalign;
+ *xalign = priv->label_xalign;
if (yalign)
- *yalign = frame->label_yalign;
+ *yalign = priv->label_yalign;
}
/**
@@ -494,19 +603,25 @@ void
gtk_frame_set_shadow_type (GtkFrame *frame,
GtkShadowType type)
{
+ GtkFramePrivate *priv;
+ GtkWidget *widget;
+
g_return_if_fail (GTK_IS_FRAME (frame));
- if ((GtkShadowType) frame->shadow_type != type)
+ priv = frame->priv;
+
+ if ((GtkShadowType) priv->shadow_type != type)
{
- frame->shadow_type = type;
- g_object_notify (G_OBJECT (frame), "shadow_type");
+ widget = GTK_WIDGET (frame);
+ priv->shadow_type = type;
+ g_object_notify (G_OBJECT (frame), "shadow-type");
- if (GTK_WIDGET_DRAWABLE (frame))
+ if (gtk_widget_is_drawable (widget))
{
- gtk_widget_queue_draw (GTK_WIDGET (frame));
+ gtk_widget_queue_draw (widget);
}
- gtk_widget_queue_resize (GTK_WIDGET (frame));
+ gtk_widget_queue_resize (widget);
}
}
@@ -524,110 +639,101 @@ gtk_frame_get_shadow_type (GtkFrame *frame)
{
g_return_val_if_fail (GTK_IS_FRAME (frame), GTK_SHADOW_ETCHED_IN);
- return frame->shadow_type;
+ return frame->priv->shadow_type;
}
static void
-gtk_frame_paint (GtkWidget *widget,
- GdkRectangle *area)
+get_padding_and_border (GtkFrame *frame,
+ GtkBorder *border)
{
- GtkFrame *frame;
- gint x, y, width, height;
+ GtkStyleContext *context;
+ GtkStateFlags state;
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- frame = GTK_FRAME (widget);
+ context = gtk_widget_get_style_context (GTK_WIDGET (frame));
+ state = gtk_widget_get_state_flags (GTK_WIDGET (frame));
- x = frame->child_allocation.x - widget->style->xthickness;
- y = frame->child_allocation.y - widget->style->ythickness;
- width = frame->child_allocation.width + 2 * widget->style->xthickness;
- height = frame->child_allocation.height + 2 * widget->style->ythickness;
+ gtk_style_context_get_padding (context, state, border);
- if (frame->label_widget)
- {
- GtkRequisition child_requisition;
- gfloat xalign;
- gint height_extra;
- gint x2;
-
- gtk_widget_get_child_requisition (frame->label_widget, &child_requisition);
-
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- xalign = frame->label_xalign;
- else
- xalign = 1 - frame->label_xalign;
-
- height_extra = MAX (0, child_requisition.height - widget->style->ythickness);
- height_extra *= (1 - frame->label_yalign);
- y -= height_extra;
- height += height_extra;
-
- x2 = widget->style->xthickness + (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_SIDE_PAD;
-
-
- gtk_paint_shadow_gap (widget->style, widget->window,
- widget->state, frame->shadow_type,
- area, widget, "frame",
- x, y, width, height,
- GTK_POS_TOP,
- x2, child_requisition.width + 2 * LABEL_PAD);
- }
- else
- gtk_paint_shadow (widget->style, widget->window,
- widget->state, frame->shadow_type,
- area, widget, "frame",
- x, y, width, height);
+ if (frame->priv->shadow_type != GTK_SHADOW_NONE)
+ {
+ GtkBorder tmp;
+
+ gtk_style_context_get_border (context, state, &tmp);
+ border->top += tmp.top;
+ border->right += tmp.right;
+ border->bottom += tmp.bottom;
+ border->left += tmp.left;
}
}
static gboolean
-gtk_frame_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_frame_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- gtk_frame_paint (widget, &event->area);
+ GtkFrame *frame;
+ GtkFramePrivate *priv;
+ GtkStyleContext *context;
+ gint x, y, width, height;
+ GtkAllocation allocation;
+ GtkBorder padding;
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
- }
+ frame = GTK_FRAME (widget);
+ priv = frame->priv;
- return FALSE;
-}
+ gtk_widget_get_allocation (widget, &allocation);
+ get_padding_and_border (frame, &padding);
+ context = gtk_widget_get_style_context (widget);
-static void
-gtk_frame_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- GtkFrame *frame = GTK_FRAME (widget);
- GtkBin *bin = GTK_BIN (widget);
- GtkRequisition child_requisition;
-
- if (frame->label_widget && GTK_WIDGET_VISIBLE (frame->label_widget))
- {
- gtk_widget_size_request (frame->label_widget, &child_requisition);
+ x = priv->child_allocation.x - allocation.x - padding.left;
+ y = priv->child_allocation.y - allocation.y - padding.top;
+ width = priv->child_allocation.width + padding.left + padding.right;
+ height = priv->child_allocation.height + padding.top + padding.bottom;
- requisition->width = child_requisition.width + 2 * LABEL_PAD + 2 * LABEL_SIDE_PAD;
- requisition->height =
- MAX (0, child_requisition.height - GTK_WIDGET (widget)->style->ythickness);
+ if (priv->shadow_type != GTK_SHADOW_NONE)
+ {
+ if (priv->label_widget)
+ {
+ gfloat xalign;
+ gint height_extra;
+ gint x2;
+
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ xalign = priv->label_xalign;
+ else
+ xalign = 1 - priv->label_xalign;
+
+ height_extra = MAX (0, priv->label_allocation.height - padding.top)
+ - priv->label_yalign * priv->label_allocation.height;
+ y -= height_extra;
+ height += height_extra;
+
+ x2 = padding.left + (priv->child_allocation.width - priv->label_allocation.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_SIDE_PAD;
+
+ gtk_render_background (context, cr, x, y, width, height);
+
+ /* If the label is completely over or under the frame we can omit the gap */
+ if (priv->label_yalign == 0.0 || priv->label_yalign == 1.0)
+ gtk_render_frame (context, cr, x, y, width, height);
+ else
+ gtk_render_frame_gap (context, cr,
+ x, y, width, height,
+ GTK_POS_TOP, x2,
+ x2 + priv->label_allocation.width + 2 * LABEL_PAD);
+ }
+ else
+ {
+ gtk_render_background (context, cr, x, y, width, height);
+ gtk_render_frame (context, cr, x, y, width, height);
+ }
}
else
{
- requisition->width = 0;
- requisition->height = 0;
+ gtk_render_background (context, cr, x, y, width, height);
}
-
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
- {
- gtk_widget_size_request (bin->child, &child_requisition);
- requisition->width = MAX (requisition->width, child_requisition.width);
- requisition->height += child_requisition.height;
- }
+ GTK_WIDGET_CLASS (gtk_frame_parent_class)->draw (widget, cr);
- requisition->width += (GTK_CONTAINER (widget)->border_width +
- GTK_WIDGET (widget)->style->xthickness) * 2;
- requisition->height += (GTK_CONTAINER (widget)->border_width +
- GTK_WIDGET (widget)->style->ythickness) * 2;
+ return FALSE;
}
static void
@@ -635,49 +741,59 @@ gtk_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkFrame *frame = GTK_FRAME (widget);
+ GtkFramePrivate *priv = frame->priv;
GtkBin *bin = GTK_BIN (widget);
GtkAllocation new_allocation;
+ GtkWidget *child;
- widget->allocation = *allocation;
+ gtk_widget_set_allocation (widget, allocation);
gtk_frame_compute_child_allocation (frame, &new_allocation);
/* If the child allocation changed, that means that the frame is drawn
* in a new place, so we must redraw the entire widget.
*/
- if (GTK_WIDGET_MAPPED (widget) &&
- (new_allocation.x != frame->child_allocation.x ||
- new_allocation.y != frame->child_allocation.y ||
- new_allocation.width != frame->child_allocation.width ||
- new_allocation.height != frame->child_allocation.height))
- gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
-
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
- gtk_widget_size_allocate (bin->child, &new_allocation);
-
- frame->child_allocation = new_allocation;
-
- if (frame->label_widget && GTK_WIDGET_VISIBLE (frame->label_widget))
+ if (gtk_widget_get_mapped (widget))
{
- GtkRequisition child_requisition;
- GtkAllocation child_allocation;
+ gdk_window_invalidate_rect (gtk_widget_get_window (widget), allocation, FALSE);
+ }
+
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child))
+ gtk_widget_size_allocate (child, &new_allocation);
+
+ priv->child_allocation = new_allocation;
+
+ if (priv->label_widget && gtk_widget_get_visible (priv->label_widget))
+ {
+ GtkBorder padding;
+ gint nat_width, width, height;
gfloat xalign;
- gtk_widget_get_child_requisition (frame->label_widget, &child_requisition);
+ get_padding_and_border (frame, &padding);
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- xalign = frame->label_xalign;
+ xalign = priv->label_xalign;
else
- xalign = 1 - frame->label_xalign;
-
- child_allocation.x = frame->child_allocation.x + LABEL_SIDE_PAD +
- (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_PAD;
- child_allocation.width = child_requisition.width;
+ xalign = 1 - priv->label_xalign;
+
+ gtk_widget_get_preferred_width (priv->label_widget, NULL, &nat_width);
+ width = new_allocation.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;
+ width = MIN (width, nat_width);
+
+ gtk_widget_get_preferred_height_for_width (priv->label_widget, width,
+ &height, NULL);
+
+
+ priv->label_allocation.x = priv->child_allocation.x + LABEL_SIDE_PAD +
+ (new_allocation.width - width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_PAD;
+
+ priv->label_allocation.width = width;
- child_allocation.y = frame->child_allocation.y - child_requisition.height;
- child_allocation.height = child_requisition.height;
+ priv->label_allocation.y = priv->child_allocation.y - MAX (height, padding.top);
+ priv->label_allocation.height = height;
- gtk_widget_size_allocate (frame->label_widget, &child_allocation);
+ gtk_widget_size_allocate (priv->label_widget, &priv->label_allocation);
}
}
@@ -695,28 +811,199 @@ static void
gtk_frame_real_compute_child_allocation (GtkFrame *frame,
GtkAllocation *child_allocation)
{
+ GtkFramePrivate *priv = frame->priv;
GtkWidget *widget = GTK_WIDGET (frame);
- GtkAllocation *allocation = &widget->allocation;
- GtkRequisition child_requisition;
+ GtkAllocation allocation;
+ GtkBorder padding;
gint top_margin;
+ guint border_width;
- if (frame->label_widget)
+ gtk_widget_get_allocation (widget, &allocation);
+ get_padding_and_border (frame, &padding);
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (frame));
+
+ if (priv->label_widget)
{
- gtk_widget_get_child_requisition (frame->label_widget, &child_requisition);
- top_margin = MAX (child_requisition.height, widget->style->ythickness);
+ gint nat_width, width, height;
+
+ gtk_widget_get_preferred_width (priv->label_widget, NULL, &nat_width);
+
+ width = allocation.width;
+ width -= 2 * LABEL_PAD + 2 * LABEL_SIDE_PAD;
+ width -= (border_width * 2) + padding.left + padding.right;
+
+ width = MIN (width, nat_width);
+
+ gtk_widget_get_preferred_height_for_width (priv->label_widget, width,
+ &height, NULL);
+
+ top_margin = MAX (height, padding.top);
}
else
- top_margin = widget->style->ythickness;
-
- child_allocation->x = (GTK_CONTAINER (frame)->border_width +
- widget->style->xthickness);
- child_allocation->width = MAX(1, (gint)allocation->width - child_allocation->x * 2);
-
- child_allocation->y = (GTK_CONTAINER (frame)->border_width + top_margin);
- child_allocation->height = MAX (1, ((gint)allocation->height - child_allocation->y -
- (gint)GTK_CONTAINER (frame)->border_width -
- (gint)widget->style->ythickness));
-
- child_allocation->x += allocation->x;
- child_allocation->y += allocation->y;
+ top_margin = padding.top;
+
+ child_allocation->x = border_width + padding.left;
+ child_allocation->y = border_width + top_margin;
+ child_allocation->width = MAX (1, (gint) (allocation.width - (border_width * 2) -
+ padding.left - padding.right));
+ child_allocation->height = MAX (1, (gint) (allocation.height - child_allocation->y -
+ border_width - padding.bottom));
+
+ child_allocation->x += allocation.x;
+ child_allocation->y += allocation.y;
+}
+
+static void
+gtk_frame_get_preferred_size (GtkWidget *request,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkFrame *frame = GTK_FRAME (request);
+ GtkFramePrivate *priv = frame->priv;
+ GtkBorder padding;
+ GtkWidget *widget = GTK_WIDGET (request);
+ GtkWidget *child;
+ GtkBin *bin = GTK_BIN (widget);
+ gint child_min, child_nat;
+ gint minimum, natural;
+ guint border_width;
+
+ get_padding_and_border (frame, &padding);
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+ if (priv->label_widget && gtk_widget_get_visible (priv->label_widget))
+ {
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ gtk_widget_get_preferred_width (priv->label_widget,
+ &child_min, &child_nat);
+ minimum = child_min + 2 * LABEL_PAD + 2 * LABEL_SIDE_PAD;
+ natural = child_nat + 2 * LABEL_PAD + 2 * LABEL_SIDE_PAD;
+ }
+ else
+ {
+ gtk_widget_get_preferred_height (priv->label_widget,
+ &child_min, &child_nat);
+ minimum = MAX (0, child_min - padding.top);
+ natural = MAX (0, child_nat - padding.top);
+ }
+ }
+ else
+ {
+ minimum = 0;
+ natural = 0;
+ }
+
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child))
+ {
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ gtk_widget_get_preferred_width (child,
+ &child_min, &child_nat);
+ minimum = MAX (minimum, child_min);
+ natural = MAX (natural, child_nat);
+ }
+ else
+ {
+ gtk_widget_get_preferred_height (child,
+ &child_min, &child_nat);
+ minimum += child_min;
+ natural += child_nat;
+ }
+ }
+
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ minimum += (border_width * 2) + padding.left + padding.right;
+ natural += (border_width * 2) + padding.left + padding.right;
+ }
+ else
+ {
+ minimum += (border_width * 2) + padding.top + padding.bottom;
+ natural += (border_width * 2) + padding.top + padding.bottom;
+ }
+
+ if (minimum_size)
+ *minimum_size = minimum;
+
+ if (natural_size)
+ *natural_size = natural;
+}
+
+static void
+gtk_frame_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_frame_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
}
+
+static void
+gtk_frame_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_frame_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+}
+
+
+static void
+gtk_frame_get_preferred_height_for_width (GtkWidget *request,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height)
+{
+ GtkWidget *widget = GTK_WIDGET (request);
+ GtkWidget *child;
+ GtkFrame *frame = GTK_FRAME (widget);
+ GtkFramePrivate *priv = frame->priv;
+ GtkBin *bin = GTK_BIN (widget);
+ GtkBorder padding;
+ gint child_min, child_nat, label_width;
+ gint minimum, natural;
+ guint border_width;
+
+ get_padding_and_border (frame, &padding);
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+ minimum = (border_width * 2) + padding.top + padding.bottom;
+ natural = (border_width * 2) + padding.top + padding.bottom;
+
+ width -= (border_width * 2) + padding.left + padding.right;
+ label_width = width - 2 * LABEL_PAD + 2 * LABEL_SIDE_PAD;
+
+ if (priv->label_widget && gtk_widget_get_visible (priv->label_widget))
+ {
+ gtk_widget_get_preferred_height_for_width (priv->label_widget,
+ label_width, &child_min, &child_nat);
+ minimum += child_min;
+ natural += child_nat;
+ }
+
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child))
+ {
+ gtk_widget_get_preferred_height_for_width (child,
+ width, &child_min, &child_nat);
+ minimum += child_min;
+ natural += child_nat;
+ }
+
+ if (minimum_height)
+ *minimum_height = minimum;
+
+ if (natural_height)
+ *natural_height = natural;
+}
+
+static void
+gtk_frame_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width)
+{
+ GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, minimum_width, natural_width);
+}
+