callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add align_set field to keep track whether the align property was set by

Browse Source 
2006-07-19  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_init),
	(gtk_cell_renderer_text_[gs]et_property), (get_layout): add
	align_set field to keep track whether the align property was
	set by the user, if not we will use the alignment by looking
	at the direction of the widget. (#157439)
This commit is contained in:
Kristian Rietveld
2006-07-19 16:27:10 +00:00
committed by Kristian Rietveld
parent cb3669e1a1
commit e1d2805cc5
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-07-19 Kristian Rietveld <kris@imendio.com>
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_init),
(gtk_cell_renderer_text_[gs]et_property), (get_layout): add
align_set field to keep track whether the align property was
set by the user, if not we will use the alignment by looking
at the direction of the widget. (#157439)
2006-07-19 Matthias Clasen <mclasen@redhat.com> 2006-07-19 Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/file/gtkprintbackendfile.c * modules/printbackends/file/gtkprintbackendfile.c

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2006-07-19 Kristian Rietveld <kris@imendio.com>
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_init),
(gtk_cell_renderer_text_[gs]et_property), (get_layout): add
align_set field to keep track whether the align property was
set by the user, if not we will use the alignment by looking
at the direction of the widget. (#157439)
2006-07-19 Matthias Clasen <mclasen@redhat.com> 2006-07-19 Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/file/gtkprintbackendfile.c * modules/printbackends/file/gtkprintbackendfile.c

17
gtk/gtkcellrenderertext.c
View File

@ -131,6 +131,7 @@ struct _GtkCellRendererTextPrivate
guint language_set : 1; guint language_set : 1;
guint markup_set : 1; guint markup_set : 1;
guint ellipsize_set : 1; guint ellipsize_set : 1;
guint align_set : 1;
gulong focus_out_id; gulong focus_out_id;
PangoLanguage *language; PangoLanguage *language;
@ -167,6 +168,7 @@ gtk_cell_renderer_text_init (GtkCellRendererText *celltext)
priv->width_chars = -1; priv->width_chars = -1;
priv->wrap_width = -1; priv->wrap_width = -1;
priv->align = PANGO_ALIGN_LEFT; priv->align = PANGO_ALIGN_LEFT;
priv->align_set = FALSE;
} }
static void static void
@ -1234,6 +1236,7 @@ gtk_cell_renderer_text_set_property (GObject *object,
case PROP_ALIGN: case PROP_ALIGN:
priv->align = g_value_get_enum (value); priv->align = g_value_get_enum (value);
priv->align_set = TRUE;
break; break;
case PROP_BACKGROUND_SET: case PROP_BACKGROUND_SET:
@ -1433,7 +1436,19 @@ get_layout (GtkCellRendererText *celltext,
pango_layout_set_wrap (layout, PANGO_WRAP_CHAR); pango_layout_set_wrap (layout, PANGO_WRAP_CHAR);
} }
pango_layout_set_alignment (layout, priv->align); if (priv->align_set)
pango_layout_set_alignment (layout, priv->align);
else
{
PangoAlignment align;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
align = PANGO_ALIGN_RIGHT;
else
align = PANGO_ALIGN_LEFT;
pango_layout_set_alignment (layout, align);
}
pango_layout_set_attributes (layout, attr_list); pango_layout_set_attributes (layout, attr_list);