gint wrap_width;
gint width_chars;
gint max_width_chars;
- gboolean full_size;
+
gboolean mnemonics_visible;
} GtkLabelPrivate;
PROP_SINGLE_LINE_MODE,
PROP_ANGLE,
PROP_MAX_WIDTH_CHARS,
- PROP_TRACK_VISITED_LINKS,
- PROP_FULL_SIZE
+ PROP_TRACK_VISITED_LINKS
};
+/* When rotating ellipsizable text we want the natural size to request
+ * more to ensure the label wont ever ellipsize in an allocation of full natural size.
+ * */
+#define ROTATION_ELLIPSIZE_PADDING 2
+
static guint signals[LAST_SIGNAL] = { 0 };
static const GdkColor default_link_color = { 0, 0, 0, 0xeeee };
static void gtk_label_clear_select_info (GtkLabel *label);
static void gtk_label_update_cursor (GtkLabel *label);
static void gtk_label_clear_layout (GtkLabel *label);
-static void gtk_label_ensure_layout (GtkLabel *label);
+static void gtk_label_ensure_layout (GtkLabel *label, gboolean guess_wrap_width);
static void gtk_label_invalidate_wrap_width (GtkLabel *label);
static void gtk_label_select_region_index (GtkLabel *label,
gint anchor_index,
static void emit_activate_link (GtkLabel *label,
GtkLabelLink *link);
-static void gtk_label_layout_interface_init (GtkExtendedLayoutIface *iface);
-
-static void gtk_label_get_desired_size (GtkExtendedLayout *layout,
- GtkRequisition *minimum_size,
- GtkRequisition *natural_size);
-static void gtk_label_get_width_for_height (GtkExtendedLayout *layout,
- gint height,
- gint *minimum_width,
- gint *natural_width);
-static void gtk_label_get_height_for_width (GtkExtendedLayout *layout,
- gint width,
- gint *minimum_height,
- gint *natural_height);
+static void gtk_label_extended_layout_init (GtkExtendedLayoutIface *iface);
+static gboolean gtk_label_is_height_for_width (GtkExtendedLayout *layout);
+static void gtk_label_get_desired_width (GtkExtendedLayout *layout,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_label_get_desired_height (GtkExtendedLayout *layout,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_label_get_width_for_height (GtkExtendedLayout *layout,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width);
+static void gtk_label_get_height_for_width (GtkExtendedLayout *layout,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height);
static GQuark quark_angle = 0;
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_label_buildable_interface_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
- gtk_label_layout_interface_init));
+ gtk_label_extended_layout_init));
static void
add_move_binding (GtkBindingSet *binding_set,
G_TYPE_BOOLEAN, TRUE);
}
-static void
-gtk_label_layout_interface_init (GtkExtendedLayoutIface *iface)
-{
- iface->get_desired_size = gtk_label_get_desired_size;
- iface->get_width_for_height = gtk_label_get_width_for_height;
- iface->get_height_for_width = gtk_label_get_height_for_width;
-}
-
static void
gtk_label_class_init (GtkLabelClass *class)
{
/**
* GtkLabel:width-chars:
- *
+ *
* The desired width of the label, in characters. If this property is set to
- * -1, the width will be calculated automatically, otherwise the label will
- * request either 3 characters or the property value, whichever is greater.
- * If the "width-chars" property is set to a positive value, then the
- * #GtkLabel:max-width-chars property is ignored.
+ * -1, the width will be calculated automatically.
+ *
+ * See the section on <link linkend="label-text-layout">text layout</link>
+ * for details of how #GtkLabel:width-chars and #GtkLabel:max-width-chars
+ * determine the width of ellipsized and wrapped labels.
*
* Since: 2.6
**/
* GtkLabel:max-width-chars:
*
* The desired maximum width of the label, in characters. If this property
- * is set to -1, the width will be calculated automatically, otherwise the
- * label will request space for no more than the requested number of
- * characters. If the #GtkLabel:width-chars property is set to a positive
- * value, then the "max-width-chars" property is ignored.
- *
+ * is set to -1, the width will be calculated automatically.
+ *
+ * See the section on <link linkend="label-text-layout">text layout</link>
+ * for details of how #GtkLabel:width-chars and #GtkLabel:max-width-chars
+ * determine the width of ellipsized and wrapped labels.
+ *
* Since: 2.6
**/
g_object_class_install_property (gobject_class,
P_("Whether visited links should be tracked"),
TRUE,
GTK_PARAM_READWRITE));
-
- /**
- * GtkLabel:full-size:
- *
- * Use the entire space the widget got assigned for text wrapping. Overrides
- * any #GtkLabel:width-chars, #GtkLabel:max-width-chars and screen size based
- * constraints. Requires #GtkLabel:angle to be 0°, 90°, 180° or 270°.
- *
- * Since: 2.18
- **/
- g_object_class_install_property (gobject_class,
- PROP_FULL_SIZE,
- g_param_spec_boolean ("full-size",
- P_("Full size"),
- P_("Use the entire size of the widget to wrap text"),
- FALSE,
- GTK_PARAM_READWRITE));
-
/*
* Key bindings
*/
case PROP_TRACK_VISITED_LINKS:
gtk_label_set_track_visited_links (label, g_value_get_boolean (value));
break;
- case PROP_FULL_SIZE:
- gtk_label_set_full_size (label, g_value_get_boolean (value));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
case PROP_TRACK_VISITED_LINKS:
g_value_set_boolean (value, gtk_label_get_track_visited_links (label));
break;
- case PROP_FULL_SIZE:
- g_value_set_int (value, gtk_label_get_full_size (label));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
{
GtkLabelPrivate *priv;
- GTK_WIDGET_SET_FLAGS (label, GTK_NO_WINDOW);
+ gtk_widget_set_has_window (GTK_WIDGET (label), FALSE);
priv = GTK_LABEL_GET_PRIVATE (label);
priv->width_chars = -1;
while (parent)
{
- if (GTK_WIDGET_CAN_FOCUS (parent) ||
+ if (gtk_widget_get_can_focus (parent) ||
(!group_cycling && GTK_WIDGET_GET_CLASS (parent)->activate_signal) ||
GTK_IS_NOTEBOOK (parent->parent) ||
GTK_IS_MENU_ITEM (parent))
guint keyval = label->mnemonic_keyval;
if (label->use_markup)
- {
- gtk_label_set_markup_internal (label, label->label, label->use_underline);
- gtk_label_compose_effective_attrs (label);
- }
+ gtk_label_set_markup_internal (label, label->label, label->use_underline);
else
{
if (label->use_underline)
- {
- gtk_label_set_uline_text_internal (label, label->label);
- gtk_label_compose_effective_attrs (label);
- }
+ gtk_label_set_uline_text_internal (label, label->label);
else
- {
- gtk_label_set_text_internal (label, g_strdup (label->label));
- gtk_label_compose_effective_attrs (label);
- }
+ {
+ if (label->effective_attrs)
+ pango_attr_list_unref (label->effective_attrs);
+ label->effective_attrs = NULL;
+ gtk_label_set_text_internal (label, g_strdup (label->label));
+ }
}
+ gtk_label_compose_effective_attrs (label);
+
if (!label->use_underline)
label->mnemonic_keyval = GDK_VoidSymbol;
gtk_label_recalculate (label);
- gtk_label_clear_layout (label);
+ gtk_label_clear_layout (label);
gtk_widget_queue_resize (GTK_WIDGET (label));
}
if (!(enable_mnemonics && priv->mnemonics_visible &&
(!auto_mnemonics ||
- (GTK_WIDGET_IS_SENSITIVE (label) &&
+ (gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
(!label->mnemonic_widget ||
- GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget))))))
+ gtk_widget_is_sensitive (label->mnemonic_widget))))))
{
gchar *tmp;
gchar *pattern;
if (enable_mnemonics && priv->mnemonics_visible && pattern &&
(!auto_mnemonics ||
- (GTK_WIDGET_IS_SENSITIVE (label) &&
+ (gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
(!label->mnemonic_widget ||
- GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget)))))
+ gtk_widget_is_sensitive (label->mnemonic_widget)))))
attrs = gtk_label_pattern_to_attrs (label, pattern);
else
attrs = NULL;
}
}
-static gint
-get_label_char_width (GtkLabel *label)
-{
- GtkLabelPrivate *priv;
- PangoContext *context;
+
+static void
+get_label_width (GtkLabel *label,
+ gint *minimum,
+ gint *natural)
+{
+ GtkWidgetAuxInfo *aux_info;
+ GtkLabelPrivate *priv;
+ PangoLayout *layout;
+ PangoContext *context;
PangoFontMetrics *metrics;
- gint char_width, digit_width, char_pixels, w;
-
- priv = GTK_LABEL_GET_PRIVATE (label);
-
- context = pango_layout_get_context (label->layout);
+ PangoRectangle rect;
+ gint char_width, digit_width, char_pixels, text_width, ellipsize_chars, guess_width;
+
+ priv = GTK_LABEL_GET_PRIVATE (label);
+ aux_info = _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
+
+ layout = pango_layout_copy (label->layout);
+ context = pango_layout_get_context (layout);
metrics = pango_context_get_metrics (context, GTK_WIDGET (label)->style->font_desc,
pango_context_get_language (context));
digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
char_pixels = MAX (char_width, digit_width);
pango_font_metrics_unref (metrics);
-
- if (priv->width_chars < 0)
- {
- PangoRectangle rect;
- pango_layout_set_width (label->layout, -1);
- pango_layout_get_extents (label->layout, NULL, &rect);
-
- w = char_pixels * MAX (priv->max_width_chars, 3);
- w = MIN (rect.width, w);
+ /* Fetch the length of the complete unwrapped text */
+ pango_layout_set_width (layout, -1);
+ pango_layout_get_extents (layout, NULL, &rect);
+ text_width = rect.width;
+
+ /* Fetch the width that was guessed by gtk_label_ensure_layout() */
+ pango_layout_get_extents (label->layout, NULL, &rect);
+ guess_width = rect.width;
+
+ /* enforce minimum width for ellipsized labels at ~3 chars */
+ if (label->ellipsize)
+ ellipsize_chars = 3;
+ else
+ ellipsize_chars = 0;
+
+ /* "width-chars" Hard-coded minimum width:
+ * - minimum size should be MAX (width-chars, strlen ("..."));
+ * - natural size should be MAX (width-chars, strlen (label->text));
+ *
+ * "max-width-chars" User specified maximum size requisition
+ * - minimum size should be MAX (width-chars, 0)
+ * - natural size should be MIN (max-width-chars, strlen (label->text))
+ *
+ * For ellipsizing labels; if max-width-chars is specified: either it is used as
+ * a minimum size or the label text as a minimum size (natural size still overflows).
+ *
+ * For wrapping labels; A reasonable minimum size is useful to naturally layout
+ * interfaces automatically. In this case if no "width-chars" is specified, the minimum
+ * width will default to the wrap guess that gtk_label_ensure_layout() does.
+ *
+ * In *any* case the minimum width is completely overridden if an explicit width
+ * request was provided.
+ */
+
+ if (label->ellipsize || label->wrap)
+ {
+ *minimum = char_pixels * MAX (priv->width_chars, ellipsize_chars);
+
+ /* Default to the minimum width regularly guessed by GTK+ if no minimum
+ * width was specified, only allow unwrapping of these labels.
+ *
+ * Note that when specifying a small width_chars for a long text;
+ * an accordingly large size will be required for the label height.
+ */
+ if (label->wrap && priv->width_chars <= 0)
+ *minimum = guess_width;
+
+ if (priv->max_width_chars < 0)
+ {
+ *natural = MAX (*minimum, text_width);
+ }
+ else
+ {
+ gint max_char_width = char_pixels * priv->max_width_chars;
+ gint max_width = MIN (text_width, max_char_width);
+
+ /* With max-char-width specified, we let the minimum widths of
+ * ellipsized text crawl up to the max-char-width
+ * (note that we dont want to limit the minimum width for wrapping text).
+ */
+ if (label->ellipsize)
+ *minimum = MIN (text_width, max_width);
+
+ *natural = MAX (*minimum, max_width);
+ }
}
else
{
- /* enforce minimum width for ellipsized labels at ~3 chars */
- w = char_pixels * MAX (priv->width_chars, 3);
+ *minimum = text_width;
+ *natural = *minimum;
}
-
- return w;
+
+ /* if a width-request is set, use that as the requested label width */
+ if ((label->wrap || label->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0) &&
+ aux_info && aux_info->width > 0)
+ {
+ *minimum = aux_info->width * PANGO_SCALE;
+ *natural = MAX (*natural, *minimum);
+ }
+
+ g_object_unref (layout);
}
static void
if (priv->wrap_width < 0)
{
- if (priv->width_chars > 0 || priv->max_width_chars > 0)
- priv->wrap_width = get_label_char_width (label);
+ if (priv->width_chars > 0)
+ {
+ PangoLayout *layout;
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+ PangoRectangle rect;
+ gint char_width, digit_width, char_pixels, text_width;
+
+ layout = pango_layout_copy (label->layout);
+ context = pango_layout_get_context (layout);
+ metrics = pango_context_get_metrics (context, GTK_WIDGET (label)->style->font_desc,
+ pango_context_get_language (context));
+
+ char_width = pango_font_metrics_get_approximate_char_width (metrics);
+ digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
+ char_pixels = MAX (char_width, digit_width);
+ pango_font_metrics_unref (metrics);
+
+ pango_layout_set_width (layout, -1);
+ pango_layout_get_extents (layout, NULL, &rect);
+ g_object_unref (layout);
+
+ text_width = rect.width;
+
+ priv->wrap_width = PANGO_PIXELS (MAX (text_width, char_pixels * priv->width_chars));
+ }
else
{
PangoLayout *layout;
layout = gtk_widget_create_pango_layout (GTK_WIDGET (label),
- "This long string gives a good enough length for any line to have.");
+ "This string is just about long enough.");
pango_layout_get_size (layout, &priv->wrap_width, NULL);
g_object_unref (layout);
}
}
static void
-gtk_label_ensure_layout (GtkLabel *label)
+gtk_label_ensure_layout (GtkLabel *label, gboolean guess_wrap_width)
{
GtkWidget *widget;
PangoRectangle logical_rect;
widget->allocation.width * PANGO_SCALE);
else if (label->wrap)
{
- GtkWidgetAuxInfo *aux_info;
+ GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (widget, FALSE);
gint longest_paragraph;
gint width, height;
-
- pango_layout_set_wrap (label->layout, label->wrap_mode);
-
- aux_info = _gtk_widget_get_aux_info (widget, FALSE);
- if (aux_info && aux_info->width > 0)
- pango_layout_set_width (label->layout, aux_info->width * PANGO_SCALE);
+ gint aux_width = 0;
+
+ if ((angle == 90 || angle == 270) && aux_info && aux_info->height > 0)
+ aux_width = aux_info->height;
+ else if (aux_info && aux_info->width > 0)
+ aux_width = aux_info->width;
+
+ if (aux_width > 0)
+ pango_layout_set_width (label->layout, aux_width * PANGO_SCALE);
+ else if (guess_wrap_width == FALSE &&
+ widget->allocation.width > 1 && widget->allocation.height > 1)
+ {
+ if (angle == 90 || angle == 270)
+ width = widget->allocation.height - label->misc.ypad * 2;
+ else
+ width = widget->allocation.width - label->misc.xpad * 2;
+
+ pango_layout_set_wrap (label->layout, label->wrap_mode);
+ pango_layout_set_width (label->layout, MAX (width, 1) * PANGO_SCALE);
+ }
else
{
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (label));
pango_layout_get_extents (label->layout, NULL, &logical_rect);
width = logical_rect.width;
-
/* Try to guess a reasonable maximum width */
longest_paragraph = width;
descent = pango_font_metrics_get_descent (metrics);
pango_font_metrics_unref (metrics);
- return PANGO_PIXELS (ascent + descent);
+ return ascent + descent;
}
static void
-gtk_label_get_desired_size (GtkExtendedLayout *layout,
- GtkRequisition *minimum_size,
- GtkRequisition *natural_size)
+gtk_label_extended_layout_init (GtkExtendedLayoutIface *iface)
+{
+ iface->is_height_for_width = gtk_label_is_height_for_width;
+ iface->get_desired_width = gtk_label_get_desired_width;
+ iface->get_desired_height = gtk_label_get_desired_height;
+ iface->get_width_for_height = gtk_label_get_width_for_height;
+ iface->get_height_for_width = gtk_label_get_height_for_width;
+}
+
+static gboolean
+gtk_label_is_height_for_width (GtkExtendedLayout *layout)
{
- GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (layout);
GtkLabel *label = GTK_LABEL (layout);
+ gdouble angle = gtk_label_get_angle (label);
+
+ if (angle == 90 || angle == 270)
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+get_size_for_allocation (GtkLabel *label,
+ GtkOrientation orientation,
+ gint allocation,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ PangoLayout *layout;
+ GtkWidgetAuxInfo *aux_info =
+ _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
+ gint aux_size;
+ gint text_height;
+
+ gtk_label_ensure_layout (label, FALSE);
+ layout = pango_layout_copy (label->layout);
+
+ if (aux_info)
+ {
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ aux_size = aux_info->width;
+ else
+ aux_size = aux_info->height;
+ }
+ else
+ aux_size = 0;
+
+ if (aux_size > 0)
+ pango_layout_set_width (layout, aux_size * PANGO_SCALE);
+ else
+ pango_layout_set_width (layout, allocation * PANGO_SCALE);
+
+ pango_layout_get_pixel_size (layout, NULL, &text_height);
+
+ if (minimum_size)
+ *minimum_size = text_height;
+
+ if (natural_size)
+ *natural_size = text_height;
+
+ g_object_unref (layout);
+}
+
+static void
+gtk_label_get_desired_size (GtkExtendedLayout *layout,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkLabel *label = GTK_LABEL (layout);
PangoRectangle required_rect;
+ PangoRectangle natural_rect;
+ gdouble angle;
- /*
- * If word wrapping is on, then the height requisition can depend
- * on:
+ /* "width-chars" Hard-coded minimum width:
+ * - minimum size should be MAX (width-chars, strlen ("..."));
+ * - natural size should be MAX (width-chars, strlen (label->text));
*
- * - Any width set on the widget via gtk_widget_set_size_request().
- * - The padding of the widget (xpad, set by gtk_misc_set_padding)
+ * "max-width-chars" User specified maximum size requisition
+ * - minimum size should be MAX (width-chars, 0)
+ * - natural size should be MIN (max-width-chars, strlen (label->text))
*
- * Instead of trying to detect changes to these quantities, if we
- * are wrapping, we just rewrap for each size request. Since
- * size requisitions are cached by the GTK+ core, this is not
- * expensive.
*/
+ /* When calculating ->wrap sometimes we need to invent a size; Ideally we should be doing
+ * that stuff here instead of inside gtk_label_ensure_layout() */
if (label->wrap)
gtk_label_clear_layout (label);
+ gtk_label_ensure_layout (label, TRUE);
- gtk_label_ensure_layout (label);
+ angle = gtk_label_get_angle (label);
- if (minimum_size)
- {
- GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
+ /* Start off with the pixel extents of the rendered layout */
+ pango_layout_get_extents (label->layout, NULL, &required_rect);
+ required_rect.x = required_rect.y = 0;
- pango_layout_get_extents (label->layout, NULL, &required_rect);
- required_rect.x = required_rect.y = 0;
+ if (label->single_line_mode || label->wrap)
+ required_rect.height = get_single_line_height (GTK_WIDGET (label), label->layout);
- if (label->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0)
- {
- /* backup the Pango layout, as get_label_char_width() scrambles it */
+ natural_rect = required_rect;
- PangoLayout *backup = label->layout;
- label->layout = pango_layout_copy (label->layout);
+ /* Calculate text width itself based on GtkLabel property rules */
+ get_label_width (label, &required_rect.width, &natural_rect.width);
- required_rect.width = get_label_char_width (label);
+ /* Now that we have minimum and natural sizes in pango extents, apply a possible transform */
+ if (label->have_transform)
+ {
+ PangoLayout *layout = pango_layout_copy (label->layout);
+ PangoContext *context = pango_layout_get_context (label->layout);
+ const PangoMatrix *matrix = pango_context_get_matrix (context);
- g_object_unref (label->layout);
- label->layout = backup;
- }
+ pango_layout_set_width (layout, -1);
+ pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE);
- if (label->single_line_mode)
- required_rect.height = get_single_line_height (GTK_WIDGET (label), label->layout);
+ pango_layout_get_extents (layout, NULL, &natural_rect);
+ g_object_unref (layout);
- if (label->have_transform)
+ pango_matrix_transform_rectangle (matrix, &required_rect);
+ pango_matrix_transform_rectangle (matrix, &natural_rect);
+
+ /* Bump the natural size in case of ellipsize to ensure pango has
+ * enough space in the angles (note, we could alternatively set the
+ * layout to not ellipsize when we know we have been allocated our
+ * full natural size, or it may be that pango needs a fix here).
+ */
+ if (label->ellipsize && angle != 0 && angle != 90 && angle != 180 && angle != 270 && angle != 360)
{
- PangoContext *context = pango_layout_get_context (label->layout);
- const PangoMatrix *matrix = pango_context_get_matrix (context);
- pango_matrix_transform_rectangle (matrix, &required_rect);
+ /* For some reason we only need this at about 110 degrees, and only
+ * when gaining in height
+ */
+ natural_rect.height += ROTATION_ELLIPSIZE_PADDING * 2 * PANGO_SCALE;
+ natural_rect.width += ROTATION_ELLIPSIZE_PADDING * 2 * PANGO_SCALE;
}
-
- required_rect.width = PANGO_PIXELS_CEIL (required_rect.width);
- required_rect.height = PANGO_PIXELS_CEIL (required_rect.height);
-
- if ((label->wrap || label->ellipsize ||
- priv->width_chars > 0 || priv->max_width_chars > 0) &&
- aux_info && aux_info->width > 0)
- required_rect.width = aux_info->width;
-
- minimum_size->width = required_rect.width + label->misc.xpad * 2;
- minimum_size->height = required_rect.height + label->misc.ypad * 2;
}
- if (natural_size)
- {
- PangoLayout *natural_layout = pango_layout_copy (label->layout);
+ required_rect.width = PANGO_PIXELS_CEIL (required_rect.width);
+ required_rect.height = PANGO_PIXELS_CEIL (required_rect.height);
- pango_layout_set_width (natural_layout, -1);
- pango_layout_set_ellipsize (natural_layout, PANGO_ELLIPSIZE_NONE);
+ natural_rect.width = PANGO_PIXELS_CEIL (natural_rect.width);
+ natural_rect.height = PANGO_PIXELS_CEIL (natural_rect.height);
- pango_layout_get_extents (natural_layout, NULL, &required_rect);
- required_rect.x = required_rect.y = 0;
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ /* Note, we cant use get_size_for_allocation() when rotating
+ * ellipsized labels.
+ */
+ if (!(label->ellipsize && label->have_transform) &&
+ (angle == 90 || angle == 270))
+ {
+ /* Doing a h4w request on a rotated label here, return the
+ * required width for the minimum height.
+ */
+ get_size_for_allocation (label,
+ GTK_ORIENTATION_VERTICAL,
+ required_rect.height,
+ minimum_size, natural_size);
- if (label->single_line_mode)
- required_rect.height = get_single_line_height (GTK_WIDGET (label), label->layout);
+ }
+ else
+ {
+ /* Normal desired width */
+ *minimum_size = required_rect.width;
+ *natural_size = natural_rect.width;
+ }
- if (label->have_transform)
+ *minimum_size += label->misc.xpad * 2;
+ *natural_size += label->misc.xpad * 2;
+ }
+ else /* GTK_ORIENTATION_VERTICAL */
+ {
+ /* Note, we cant use get_size_for_allocation() when rotating
+ * ellipsized labels.
+ */
+ if (!(label->ellipsize && label->have_transform) &&
+ (angle == 0 || angle == 180))
+ {
+ /* Doing a w4h request on a label here, return the required
+ * height for the minimum width.
+ */
+ get_size_for_allocation (label,
+ GTK_ORIENTATION_HORIZONTAL,
+ required_rect.width,
+ minimum_size, natural_size);
+ }
+ else
{
- PangoContext *context = pango_layout_get_context (natural_layout);
- const PangoMatrix *matrix = pango_context_get_matrix (context);
- pango_matrix_transform_rectangle (matrix, &required_rect);
+ /* A vertically rotated label does w4h, so return the base
+ * desired height (text length)
+ */
+ *minimum_size = required_rect.height;
+ *natural_size = natural_rect.height;
}
- required_rect.width = PANGO_PIXELS_CEIL (required_rect.width);
- required_rect.height = PANGO_PIXELS_CEIL (required_rect.height);
+ *minimum_size += label->misc.ypad * 2;
+ *natural_size += label->misc.ypad * 2;
+ }
- natural_size->width = required_rect.width + label->misc.xpad * 2;
- natural_size->height = required_rect.height + label->misc.ypad * 2;
+ /* Restore real allocated size of layout; sometimes size-requests
+ * are randomly called without a following allocation; for this case
+ * we need to make sure we dont have a mucked up layout because we
+ * went and guessed the wrap-size.
+ */
+ if (label->wrap)
+ gtk_label_clear_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
- g_object_unref (natural_layout);
- }
}
+
static void
-get_size_for_allocation (GtkLabel *label,
- gint allocation,
- gint *minimum_size,
- gint *natural_size)
+gtk_label_get_desired_width (GtkExtendedLayout *layout,
+ gint *minimum_size,
+ gint *natural_size)
{
- PangoLayout *layout;
-
- gtk_label_ensure_layout (label);
- layout = pango_layout_copy (label->layout);
- pango_layout_set_width (layout, PANGO_SCALE * allocation);
-
- if (minimum_size)
- pango_layout_get_pixel_size (layout, NULL, minimum_size);
-
- if (natural_size)
- {
-// pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE);
- pango_layout_get_pixel_size (layout, NULL, natural_size);
- }
+ gtk_label_get_desired_size (layout,
+ GTK_ORIENTATION_HORIZONTAL,
+ minimum_size, natural_size);
+}
- g_object_unref (layout);
+static void
+gtk_label_get_desired_height (GtkExtendedLayout *layout,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_label_get_desired_size (layout,
+ GTK_ORIENTATION_VERTICAL,
+ minimum_size, natural_size);
}
static void
GtkLabel *label = GTK_LABEL (layout);
gdouble angle = gtk_label_get_angle (label);
- if (90 == angle || 270 == angle)
- get_size_for_allocation (label, height, minimum_width, natural_width);
- else
+ if (label->wrap && (angle == 90 || angle == 270))
{
- GtkRequisition minimum_size, natural_size;
+ if (label->wrap)
+ gtk_label_clear_layout (label);
- gtk_extended_layout_get_desired_size (layout,
- minimum_width ? &minimum_size : NULL,
- natural_width ? &natural_size : NULL);
+ get_size_for_allocation (label, GTK_ORIENTATION_VERTICAL,
+ MAX (1, height - (label->misc.ypad * 2)),
+ minimum_width, natural_width);
if (minimum_width)
- *minimum_width = minimum_size.width;
+ *minimum_width += label->misc.xpad * 2;
+
if (natural_width)
- *natural_width = natural_size.width;
+ *natural_width += label->misc.xpad * 2;
}
+ else
+ GTK_EXTENDED_LAYOUT_GET_IFACE (layout)->get_desired_width (layout, minimum_width, natural_width);
}
static void
GtkLabel *label = GTK_LABEL (layout);
gdouble angle = gtk_label_get_angle (label);
- if (0 == angle || 180 == angle)
- get_size_for_allocation (label, width, minimum_height, natural_height);
- else
+ if (label->wrap && (angle == 0 || angle == 180 || angle == 360))
{
- GtkRequisition minimum_size, natural_size;
+ if (label->wrap)
+ gtk_label_clear_layout (label);
- gtk_extended_layout_get_desired_size (layout,
- minimum_height ? &minimum_size : NULL,
- natural_height ? &natural_size : NULL);
+ get_size_for_allocation (label, GTK_ORIENTATION_HORIZONTAL,
+ MAX (1, width - label->misc.xpad * 2),
+ minimum_height, natural_height);
if (minimum_height)
- *minimum_height = minimum_size.height;
+ *minimum_height += label->misc.ypad * 2;
+
if (natural_height)
- *natural_height = natural_size.height;
+ *natural_height += label->misc.ypad * 2;
}
+ else
+ GTK_EXTENDED_LAYOUT_GET_IFACE (layout)->get_desired_height (layout, minimum_height, natural_height);
}
static void
GTK_WIDGET_CLASS (gtk_label_parent_class)->size_allocate (widget, allocation);
+ /* The layout may have been recently cleared in get_size_for_orientation(),
+ * but the width at that point may not be the same as the allocated width
+ */
+ if (label->wrap)
+ gtk_label_clear_layout (label);
+
+ gtk_label_ensure_layout (label, FALSE);
+
if (label->ellipsize)
{
if (label->layout)
- {
- gint width;
- PangoRectangle logical;
+ {
+ PangoRectangle logical;
+ PangoRectangle bounds;
- width = (allocation->width - label->misc.xpad * 2) * PANGO_SCALE;
+ bounds.x = bounds.y = 0;
+ bounds.width = allocation->width - label->misc.xpad * 2;
+ bounds.height = allocation->height - label->misc.ypad * 2;
- pango_layout_set_width (label->layout, -1);
- pango_layout_get_extents (label->layout, NULL, &logical);
+ pango_layout_set_width (label->layout, -1);
+ pango_layout_get_pixel_extents (label->layout, NULL, &logical);
- if (logical.width > width)
- pango_layout_set_width (label->layout, width);
- }
+ if (label->have_transform)
+ {
+ PangoContext *context = gtk_widget_get_pango_context (widget);
+ const PangoMatrix *matrix = pango_context_get_matrix (context);
+
+ const gdouble dx = matrix->xx; /* cos (M_PI * angle / 180) */
+ const gdouble dy = matrix->xy; /* sin (M_PI * angle / 180) */
+ if (fabs (dy) < 0.01)
+ {
+ if (logical.width > bounds.width)
+ pango_layout_set_width (label->layout, bounds.width * PANGO_SCALE);
+ }
+ else if (fabs (dx) < 0.01)
+ {
+ if (logical.width > bounds.height)
+ pango_layout_set_width (label->layout, bounds.height * PANGO_SCALE);
+ }
+ else
+ {
+ gdouble x0, y0, x1, y1, length;
+ gboolean vertical;
+ gint cy;
+
+ x0 = bounds.width / 2;
+ y0 = dx ? x0 * dy / dx : dy * INFINITY;
+ vertical = fabs (y0) > bounds.height / 2;
+
+ if (vertical)
+ {
+ y0 = bounds.height/2;
+ x0 = dy ? y0 * dx / dy : dx * INFINITY;
+ }
+
+ length = 2 * sqrt (x0 * x0 + y0 * y0);
+ pango_layout_set_width (label->layout, rint (length * PANGO_SCALE));
+ pango_layout_get_pixel_size (label->layout, NULL, &cy);
+
+ x1 = +dy * cy/2;
+ y1 = -dx * cy/2;
+
+ if (vertical)
+ {
+ y0 = bounds.height/2 + y1 - y0;
+ x0 = -y0 * dx/dy;
+ }
+ else
+ {
+ x0 = bounds.width/2 + x1 - x0;
+ y0 = -x0 * dy/dx;
+ }
+
+ length = length - sqrt (x0 * x0 + y0 * y0) * 2;
+ pango_layout_set_width (label->layout, rint (length * PANGO_SCALE));
+ }
+ }
+ else if (logical.width > bounds.width)
+ pango_layout_set_width (label->layout, bounds.width * PANGO_SCALE);
+ }
}
if (label->select_info && label->select_info->window)
static void
gtk_label_update_cursor (GtkLabel *label)
{
+ GtkWidget *widget;
+
if (!label->select_info)
return;
- if (GTK_WIDGET_REALIZED (label))
+ widget = GTK_WIDGET (label);
+
+ if (gtk_widget_get_realized (widget))
{
GdkDisplay *display;
GdkCursor *cursor;
- if (GTK_WIDGET_IS_SENSITIVE (label))
+ if (gtk_widget_is_sensitive (widget))
{
- display = gtk_widget_get_display (GTK_WIDGET (label));
+ display = gtk_widget_get_display (widget);
if (label->select_info->active_link)
cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
gint *yp)
{
GtkMisc *misc;
- GtkWidget *widget;
+ GtkWidget *widget;
GtkLabelPrivate *priv;
gfloat xalign;
gint req_width, x, y;
+ gint req_height;
PangoRectangle logical;
-
- misc = GTK_MISC (label);
+ gdouble angle;
+
+ misc = GTK_MISC (label);
widget = GTK_WIDGET (label);
- priv = GTK_LABEL_GET_PRIVATE (label);
+ priv = GTK_LABEL_GET_PRIVATE (label);
+ angle = gtk_label_get_angle (label);
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
xalign = misc->xalign;
else
xalign = 1.0 - misc->xalign;
- pango_layout_get_pixel_extents (label->layout, NULL, &logical);
+ pango_layout_get_extents (label->layout, NULL, &logical);
- if (label->ellipsize || priv->width_chars > 0)
+ /* Do the wrap width delimiting before the transform
+ */
+ if (label->wrap || label->ellipsize || priv->width_chars > 0)
{
int width;
width = pango_layout_get_width (label->layout);
- req_width = logical.width;
if (width != -1)
- req_width = MIN(PANGO_PIXELS (width), req_width);
- req_width += 2 * misc->xpad;
+ logical.width = MIN (width, logical.width);
}
- else
- req_width = widget->requisition.width;
+
+ if (label->have_transform)
+ {
+ PangoContext *context = gtk_widget_get_pango_context (widget);
+ const PangoMatrix *matrix = pango_context_get_matrix (context);
+ pango_matrix_transform_rectangle (matrix, &logical);
+ }
+
+ pango_extents_to_pixels (&logical, NULL);
+
+ req_width = logical.width;
+ req_height = logical.height;
+
+ req_width += 2 * misc->xpad;
+ req_height += 2 * misc->ypad;
x = floor (widget->allocation.x + (gint)misc->xpad +
xalign * (widget->allocation.width - req_width));
x = MAX (x, widget->allocation.x + misc->xpad);
else
x = MIN (x, widget->allocation.x + widget->allocation.width - misc->xpad);
- x -= logical.x;
+
+
+
/* bgo#315462 - For single-line labels, *do* align the requisition with
* respect to the allocation, even if we are under-allocated. For multi-line
*/
if (pango_layout_get_line_count (label->layout) == 1)
y = floor (widget->allocation.y + (gint)misc->ypad
- + (widget->allocation.height - widget->requisition.height) * misc->yalign);
+ + (widget->allocation.height - req_height) * misc->yalign);
else
y = floor (widget->allocation.y + (gint)misc->ypad
- + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),
+ + MAX (((widget->allocation.height - req_height) * misc->yalign),
0));
if (xp)
g_assert (label->select_info);
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
for (l = pango_layout_get_lines_readonly (label->layout); l; l = l->next)
{
static void
gtk_label_draw_cursor (GtkLabel *label, gint xoffset, gint yoffset)
{
+ GtkWidget *widget;
+
if (label->select_info == NULL)
return;
+
+ widget = GTK_WIDGET (label);
- if (GTK_WIDGET_DRAWABLE (label))
+ if (gtk_widget_is_drawable (widget))
{
- GtkWidget *widget = GTK_WIDGET (label);
-
PangoDirection keymap_direction;
PangoDirection cursor_direction;
PangoRectangle strong_pos, weak_pos;
keymap_direction = gdk_keymap_get_direction (gdk_keymap_get_for_display (gtk_widget_get_display (widget)));
cursor_direction = get_cursor_direction (label);
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
pango_layout_get_cursor_pos (label->layout, label->select_info->selection_end,
&strong_pos, &weak_pos);
GtkLabelSelectionInfo *info = label->select_info;
gint x, y;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget) &&
+ if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget) &&
label->text && (*label->text != '\0'))
{
get_layout_location (label, &x, &y);
gtk_paint_layout (widget->style,
widget->window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
FALSE,
&event->area,
widget,
state = GTK_STATE_SELECTED;
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
state = GTK_STATE_ACTIVE;
gdk_draw_layout_with_colors (widget->window,
GdkColor *link_color;
GdkColor *visited_link_color;
- if (info->selectable && GTK_WIDGET_HAS_FOCUS (widget))
+ if (info->selectable && gtk_widget_has_focus (widget))
gtk_label_draw_cursor (label, x, y);
focus_link = gtk_label_get_focus_link (label);
gdk_region_destroy (clip);
}
- if (focus_link && GTK_WIDGET_HAS_FOCUS (widget))
+ if (focus_link && gtk_widget_has_focus (widget))
{
range[0] = focus_link->start;
range[1] = focus_link->end;
1);
gdk_region_get_clipbox (clip, &rect);
- gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
+ gtk_paint_focus (widget->style, widget->window, gtk_widget_get_state (widget),
&event->area, widget, "label",
rect.x, rect.y, rect.width, rect.height);
gchar **pattern)
{
gboolean underscore;
- gchar *src;
+ const gchar *src;
gchar *dest;
gchar *pattern_dest;
while (*src)
{
gunichar c;
- gchar *next_src;
+ const gchar *next_src;
c = g_utf8_get_char (src);
if (c == (gunichar)-1)
*index = 0;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
window_to_layout_coords (label, &x, &y);
if (event->button == 1)
{
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
{
label->in_click = TRUE;
gtk_widget_grab_focus (widget);
gint attributes_mask;
g_assert (label->select_info);
- g_assert (GTK_WIDGET_REALIZED (label));
+ widget = GTK_WIDGET (label);
+ g_assert (gtk_widget_get_realized (widget));
if (label->select_info->window)
return;
-
- widget = GTK_WIDGET (label);
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
- if (GTK_WIDGET_IS_SENSITIVE (widget))
+ if (gtk_widget_is_sensitive (widget))
{
attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
GDK_XTERM);
{
label->select_info = g_new0 (GtkLabelSelectionInfo, 1);
- GTK_WIDGET_SET_FLAGS (label, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (GTK_WIDGET (label), TRUE);
- if (GTK_WIDGET_REALIZED (label))
+ if (gtk_widget_get_realized (GTK_WIDGET (label)))
gtk_label_create_window (label);
- if (GTK_WIDGET_MAPPED (label))
+ if (gtk_widget_get_mapped (GTK_WIDGET (label)))
gdk_window_show (label->select_info->window);
}
}
g_free (label->select_info);
label->select_info = NULL;
- GTK_WIDGET_UNSET_FLAGS (label, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (GTK_WIDGET (label), FALSE);
}
}
{
g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
return label->layout;
}
/**
* gtk_label_get_layout_offsets:
* @label: a #GtkLabel
- * @x: location to store X offset of layout, or %NULL
- * @y: location to store Y offset of layout, or %NULL
+ * @x: (allow-none): location to store X offset of layout, or %NULL
+ * @y: (allow-none): location to store Y offset of layout, or %NULL
*
* Obtains the coordinates where the label will draw the #PangoLayout
* representing the text in the label; useful to convert mouse events
{
g_return_if_fail (GTK_IS_LABEL (label));
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
get_layout_location (label, x, y);
}
gtk_label_recalculate (label);
}
-gboolean
-gtk_label_get_full_size (GtkLabel *label)
-{
- g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
- return GTK_LABEL_GET_PRIVATE (label)->full_size;
-}
-
-void
-gtk_label_set_full_size (GtkLabel *label,
- gboolean setting)
-{
- GtkLabelPrivate *priv;
-
- g_return_if_fail (GTK_IS_LABEL (label));
- priv = GTK_LABEL_GET_PRIVATE (label);
-
- if (priv->full_size != setting)
- {
- priv->full_size = setting;
-
- g_object_notify (G_OBJECT (label), "full-size");
- gtk_label_invalidate_wrap_width (label);
- gtk_widget_queue_resize (GTK_WIDGET (label));
- }
-}
-
/**
* gtk_label_get_use_underline:
* @label: a #GtkLabel
"gtk-split-cursor", &split_cursor,
NULL);
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
pango_layout_get_cursor_pos (label->layout, index,
&strong_pos, &weak_pos);
gint n_attrs;
gint length;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
length = g_utf8_strlen (label->text, -1);
gboolean split_cursor;
gboolean strong;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
"gtk-split-cursor", &split_cursor,
PangoLogAttr *log_attrs;
gint n_attrs;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
PangoLogAttr *log_attrs;
gint n_attrs;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
label = GTK_LABEL (user_data);
widget = GTK_WIDGET (label);
- g_return_if_fail (GTK_WIDGET_REALIZED (label));
+ g_return_if_fail (gtk_widget_get_realized (widget));
screen = gtk_widget_get_screen (widget);
gdk_window_get_origin (widget->window, x, y);
if (window &&
window->default_widget != widget &&
!(widget == window->focus_widget &&
- (!window->default_widget || !GTK_WIDGET_IS_SENSITIVE (window->default_widget))))
+ (!window->default_widget || !gtk_widget_is_sensitive (window->default_widget))))
gtk_window_activate_default (window);
}
}
projects / ~andy / gtk / blobdiff