2000-10-05 01:04:57 +00:00
|
|
|
/* gtkcellrenderertext.c
|
|
|
|
* Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "gtkcellrenderertext.h"
|
Adapt to GtkTreeSelection changes
2001-01-01 Havoc Pennington <hp@redhat.com>
* gtk/gtktreeview.c: Adapt to GtkTreeSelection changes
* gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view):
don't fill in tree_view->priv->selection, kind of an unexpected
side effect
* gtk/gtkcellrenderertext.c: Remove definition of _ and include
gtkintl.h
* gtk/gtkcellrenderer.c: Remove definition of _ and include
gtkintl.h
(gtk_cell_renderer_get_property): remove calls to g_value_init
* gtk/gtkcellrendererpixbuf.c: Remove definition of _ and include
gtkintl.h
* gtk/gtkcellrenderertextpixbuf.c: Remove definition of _ macro
and include gtkintl.h
(gtk_cell_renderer_text_pixbuf_class_init): remove spaces from
property names
* gtk/gtktreeselection.c (_gtk_tree_selection_new): rename, return
GtkTreeSelection
(_gtk_tree_selection_new_from_with_view): rename, return
GtkTreeSelection
(_gtk_tree_selection_set_tree_view): rename with uscore
(gtk_tree_selection_get_selected): fill in the "model" out param
first, so it gets filled in even if we return at the top of the
function
(gtk_tree_selection_real_select_all): add a comment and an else{}
to clarify this a bit
(gtk_tree_selection_real_unselect_all): add the same else{}
* gtk/gtktreeselection.h: Rename new, new_with_tree_view, and
set_tree_view to have underscore prefixes, move them to the
private header, fix return type of new_with_tree_view
(struct _GtkTreeSelection): mark struct
fields private
* gtk/gtktreemodel.c (gtk_tree_model_get_flags): return
GtkTreeModelFlags, not a guint
(gtk_tree_path_prev): return gboolean not gint
(gtk_tree_path_up): return gboolean not gint
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): make get_flags
return GtkTreeModelFlags, not a guint
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): check
that child model is non-null before unrefing it
(g_value_int_compare_func): make this a qsort compare func, not
a boolean predicate
* gtk/gtktreemodelsort.h: rename gtk_tree_model_set_sort_column,
(add -umn to the end), and mark it unimplemented
(gtk_tree_model_sort_resort): remove, this wasn't implemented, and
I don't see what it's for - doesn't the model always sort itself?
(gtk_tree_model_sort_set_compare): this had the wrong signature
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_attributes):
Fix the docs to say that it destructively replaces existing
attributes (previously said that it added attributes).
(gtk_tree_view_column_set_visible): canonicalize bool before
equality testing. Also, check for realization before
hiding/showing the tree_column->window; if this window could exist
before realization, then it's busted and needs fixing, we can't
create GDK resources pre-realization. Also, remove
superfluous queue_resize(), since set_size() does that for us.
(gtk_tree_view_column_set_col_type): check realization before
using tree_column->window
* gtk/gtktreedatalist.c: fix filename in copyright notice
2001-01-01 19:01:54 +00:00
|
|
|
#include "gtkintl.h"
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
static void gtk_cell_renderer_text_init (GtkCellRendererText *celltext);
|
|
|
|
static void gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class);
|
|
|
|
|
2000-12-12 07:32:32 +00:00
|
|
|
static void gtk_cell_renderer_text_get_property (GObject *object,
|
|
|
|
guint param_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec,
|
|
|
|
const gchar *trailer);
|
|
|
|
static void gtk_cell_renderer_text_set_property (GObject *object,
|
|
|
|
guint param_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec,
|
|
|
|
const gchar *trailer);
|
2000-10-05 01:04:57 +00:00
|
|
|
static void gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
|
|
|
|
GtkWidget *widget,
|
|
|
|
gint *width,
|
|
|
|
gint *height);
|
|
|
|
static void gtk_cell_renderer_text_render (GtkCellRenderer *cell,
|
|
|
|
GdkWindow *window,
|
|
|
|
GtkWidget *widget,
|
|
|
|
GdkRectangle *background_area,
|
|
|
|
GdkRectangle *cell_area,
|
|
|
|
GdkRectangle *expose_area,
|
|
|
|
guint flags);
|
|
|
|
|
|
|
|
|
|
|
|
enum {
|
|
|
|
PROP_ZERO,
|
|
|
|
PROP_TEXT,
|
|
|
|
PROP_FONT,
|
|
|
|
PROP_BACKGROUND,
|
|
|
|
PROP_BACKGROUND_GDK,
|
|
|
|
PROP_FOREGROUND,
|
|
|
|
PROP_FOREGROUND_GDK,
|
|
|
|
PROP_STRIKETHROUGH,
|
|
|
|
PROP_UNDERLINE,
|
|
|
|
PROP_EDITABLE,
|
|
|
|
PROP_ITALIC,
|
|
|
|
PROP_BOLD
|
|
|
|
};
|
|
|
|
|
|
|
|
GtkType
|
|
|
|
gtk_cell_renderer_text_get_type (void)
|
|
|
|
{
|
|
|
|
static GtkType cell_text_type = 0;
|
|
|
|
|
|
|
|
if (!cell_text_type)
|
|
|
|
{
|
|
|
|
static const GTypeInfo cell_text_info =
|
|
|
|
{
|
|
|
|
sizeof (GtkCellRendererTextClass),
|
|
|
|
NULL, /* base_init */
|
|
|
|
NULL, /* base_finalize */
|
|
|
|
(GClassInitFunc) gtk_cell_renderer_text_class_init,
|
|
|
|
NULL, /* class_finalize */
|
|
|
|
NULL, /* class_data */
|
|
|
|
sizeof (GtkCellRendererText),
|
|
|
|
0, /* n_preallocs */
|
|
|
|
(GInstanceInitFunc) gtk_cell_renderer_text_init,
|
|
|
|
};
|
|
|
|
|
urg, removed implementation of gtk_marshal_VOID__INT_INT_INT_INT. if
Wed Oct 25 20:47:41 2000 Tim Janik <timj@gtk.org>
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): urg, removed
implementation of gtk_marshal_VOID__INT_INT_INT_INT. if people do that,
couldn't they at least give it a non-standard name?
* gtk/gtktextlayout.c: arg! yet another implementation of
gtk_marshal_VOID__INT_INT_INT_INT(), is this a conspiracy?
* gtk/gtktextbuffer.c: gotcha! captured a vagabonding
gtk_marshal_VOID__INT_POINTER_INT() implementation, braught it back
home. now i know this _is_ a conspiracy.
* gtk/gtkwidget.c (gtk_widget_class_init): marshaller fixups for
::state-changed.
* gtk/gtkaccelgroup.c (gtk_accel_group_create_remove):
(gtk_accel_group_create_add): marshaller signature fixups.
* gtk/gtklistitem.c (gtk_list_item_class_init): signal creation fixups,
pass in GTK_TYPE_SCROLL_TYPE instead of GTK_TYPE_ENUM.
* gtk/gtkobject.[hc]: removed GTK_CONNECTED flag, it's not valid
anymore.
Tue Oct 24 23:59:21 2000 Tim Janik <timj@gtk.org>
* docs/reference/Makefile.am: disabled SUBDIRS for the moment, since
due to the signal system changes, it wouldn't build currently. to
be fixed soon.
* docs/Changes-2.0.txt: GtkSignal/GSignal updates.
* gtk/gtkwidget.c: ::direction_changed takes an enum as argument,
so it needs gtk_marshal_VOID__ENUM() instead of
gtk_marshal_NONE__UINT().
* gdk/gdk*.c: adapted type registration functions.
* gtk/gtkbindings.c:
* gtk/gtkaccelgroup.c: operate on GSignalQuery, GtkSignalQuery is
gone.
* gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType.
* gtk/gtkobject.c:
(gtk_object_destroy):
(gtk_object_shutdown): fixed recursion guards. basically we have to
catch the case where any of GObject.shutdown() or gtk_object_destroy()
is called during ::destroy, and avoid recursion there.
* gtk/gtktypeutils.c:
* gtk/maketypes.awk: awk-script hackup to provide gtk_type_init() with
boxed_copy/boxed_free. this needs a more general solution based on a
publically installed code-generator utility.
* gtk/gtktypeutils.[hc]: compat aliased GTK_TYPE_BOXED to G_TYPE_BOXED,
glib's gobject has support for that now.
define GtkSignalMarshaller in terms of GSignalCMarshaller.
Mon Oct 23 09:36:42 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]:
* gtk/gtkmarshal.[hc]:
* gtk/Makefile.am: generate marshallers with glib-genmarshal and don't
compile gtkmarshal.c on its own anymore, just include it in gtksignal.c.
removed #include <gtkmarshal.h>s all over the place, gtksignal.h takes
care of that.
* *.c: marshaller name fixups.
* gtk/gtkmarshal.list: added a comment briefing the format.
Sun Oct 22 23:14:39 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: nuked old implementation. we mostly have
compatibility macros here now. more specifically, most of
the API is preserved (yes, _most_, nonwithstanding the
following exceptions listed, the API is stil lHUGE ;)
things that got removed completely:
GtkSignalQuery, gtk_signal_query(), gtk_signal_n_emissions(),
gtk_signal_n_emissions_by_name(), gtk_signal_handlers_destroy(),
gtk_signal_set_funcs(), gtk_signal_handler_pending_by_id(),
gtk_signal_add_emission_hook(), gtk_signal_add_emission_hook_full(),
gtk_signal_remove_emission_hook().
non-functional functions variants:
gtk_signal_add_emission_hook(), gtk_signal_remove_emission_hook().
the GtkCallbackMarshal argument to gtk_signal_connect_full() is
not supported anymore.
(gtk_signal_compat_matched): new internal function to aid
implementation of the compatibility macros, it provides
functionality to block/unblock/disconnect handlers based
on func/data.
* gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType,
* *.c: adaptions to new type registration API signatures.
Fri Oct 20 15:26:33 2000 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.[hc]: removed G_TYPE_GTK_POINTER cludge.
2000-10-25 22:34:14 +00:00
|
|
|
cell_text_type = g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererText", &cell_text_info, 0);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return cell_text_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_renderer_text_init (GtkCellRendererText *celltext)
|
|
|
|
{
|
|
|
|
celltext->attr_list = pango_attr_list_new ();
|
|
|
|
GTK_CELL_RENDERER (celltext)->xalign = 0.0;
|
|
|
|
GTK_CELL_RENDERER (celltext)->yalign = 0.5;
|
|
|
|
GTK_CELL_RENDERER (celltext)->xpad = 2;
|
|
|
|
GTK_CELL_RENDERER (celltext)->ypad = 2;
|
|
|
|
celltext->underline = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
|
|
|
|
{
|
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (class);
|
|
|
|
GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
|
|
|
|
|
2000-12-12 07:32:32 +00:00
|
|
|
object_class->get_property = gtk_cell_renderer_text_get_property;
|
|
|
|
object_class->set_property = gtk_cell_renderer_text_set_property;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
cell_class->get_size = gtk_cell_renderer_text_get_size;
|
|
|
|
cell_class->render = gtk_cell_renderer_text_render;
|
2000-12-12 07:32:32 +00:00
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_TEXT,
|
|
|
|
g_param_spec_string ("text",
|
|
|
|
_("Text String"),
|
|
|
|
_("The text of the renderer."),
|
|
|
|
"",
|
|
|
|
G_PARAM_READABLE |
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_FONT,
|
|
|
|
g_param_spec_string ("font",
|
|
|
|
_("Font String"),
|
|
|
|
_("The string of the font."),
|
|
|
|
"",
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_BACKGROUND,
|
|
|
|
g_param_spec_string ("background",
|
|
|
|
_("Background Color string"),
|
|
|
|
_("The color for the background of the text."),
|
|
|
|
"white",
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_FOREGROUND,
|
|
|
|
g_param_spec_string ("foreground",
|
|
|
|
_("Foreground Color string"),
|
|
|
|
_("The color for the background of the text."),
|
|
|
|
"black",
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_STRIKETHROUGH,
|
|
|
|
g_param_spec_boolean ("strikethrough",
|
|
|
|
_("Strikethrough"),
|
|
|
|
_("Draw a line through the text."),
|
|
|
|
FALSE,
|
|
|
|
G_PARAM_READABLE |
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_UNDERLINE,
|
|
|
|
g_param_spec_boolean ("underline",
|
|
|
|
_("Underline"),
|
|
|
|
_("Underline the text."),
|
|
|
|
FALSE,
|
|
|
|
G_PARAM_READABLE |
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_EDITABLE,
|
|
|
|
g_param_spec_boolean ("editable",
|
|
|
|
_("Editable"),
|
|
|
|
_("Make the text editable."),
|
|
|
|
FALSE,
|
|
|
|
G_PARAM_READABLE |
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_ITALIC,
|
|
|
|
g_param_spec_boolean ("italic",
|
|
|
|
_("Italic"),
|
|
|
|
_("Make the text italic."),
|
|
|
|
FALSE,
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_BOLD,
|
|
|
|
g_param_spec_boolean ("bold",
|
|
|
|
_("Bold"),
|
|
|
|
_("Make the text bold."),
|
|
|
|
FALSE,
|
|
|
|
G_PARAM_WRITABLE));
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-12-12 07:32:32 +00:00
|
|
|
gtk_cell_renderer_text_get_property (GObject *object,
|
|
|
|
guint param_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec,
|
|
|
|
const gchar *trailer)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
|
|
|
|
PangoAttrIterator *attr_iter;
|
|
|
|
PangoAttribute *attr;
|
|
|
|
|
|
|
|
switch (param_id)
|
|
|
|
{
|
|
|
|
case PROP_TEXT:
|
|
|
|
g_value_set_string (value, celltext->text);
|
|
|
|
break;
|
|
|
|
case PROP_STRIKETHROUGH:
|
|
|
|
attr_iter = pango_attr_list_get_iterator (celltext->attr_list);
|
|
|
|
attr = pango_attr_iterator_get (attr_iter,
|
|
|
|
PANGO_ATTR_STRIKETHROUGH);
|
|
|
|
g_value_set_boolean (value, ((PangoAttrInt*) attr)->value);
|
|
|
|
break;
|
|
|
|
case PROP_UNDERLINE:
|
|
|
|
g_value_set_boolean (value, celltext->underline);
|
|
|
|
break;
|
|
|
|
case PROP_EDITABLE:
|
|
|
|
g_value_set_boolean (value, celltext->editable);
|
|
|
|
break;
|
|
|
|
default:
|
2000-12-12 07:32:32 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
|
2000-10-05 01:04:57 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2000-12-12 07:32:32 +00:00
|
|
|
gtk_cell_renderer_text_set_property (GObject *object,
|
|
|
|
guint param_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec,
|
|
|
|
const gchar *trailer)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
|
|
|
|
|
|
|
|
GdkColor color;
|
|
|
|
PangoFontDescription *font_desc;
|
|
|
|
gchar *string;
|
|
|
|
PangoAttribute *attribute;
|
|
|
|
gchar *font;
|
|
|
|
|
|
|
|
switch (param_id)
|
|
|
|
{
|
|
|
|
case PROP_TEXT:
|
|
|
|
g_free (celltext->text);
|
|
|
|
celltext->text = g_value_dup_string (value);
|
|
|
|
break;
|
|
|
|
case PROP_FONT:
|
|
|
|
font = g_value_get_string (value);
|
|
|
|
|
|
|
|
if (font)
|
|
|
|
{
|
|
|
|
font_desc = pango_font_description_from_string (font);
|
|
|
|
attribute = pango_attr_font_desc_new (font_desc);
|
|
|
|
attribute->start_index = 0;
|
|
|
|
attribute->end_index = G_MAXINT;
|
|
|
|
pango_font_description_free (font_desc);
|
|
|
|
pango_attr_list_change (celltext->attr_list,
|
|
|
|
attribute);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case PROP_BACKGROUND:
|
|
|
|
string = g_value_get_string (value);
|
|
|
|
if (string && gdk_color_parse (string, &color))
|
|
|
|
{
|
|
|
|
attribute = pango_attr_background_new (color.red,
|
|
|
|
color.green,
|
|
|
|
color.blue);
|
|
|
|
attribute->start_index = 0;
|
|
|
|
attribute->end_index = G_MAXINT;
|
|
|
|
pango_attr_list_change (celltext->attr_list,
|
|
|
|
attribute);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case PROP_BACKGROUND_GDK:
|
|
|
|
break;
|
|
|
|
case PROP_FOREGROUND:
|
|
|
|
string = g_value_get_string (value);
|
|
|
|
if (string && gdk_color_parse (string, &color))
|
|
|
|
{
|
|
|
|
attribute = pango_attr_foreground_new (color.red,
|
|
|
|
color.green,
|
|
|
|
color.blue);
|
|
|
|
attribute->start_index = 0;
|
|
|
|
attribute->end_index = G_MAXINT;
|
|
|
|
pango_attr_list_change (celltext->attr_list,
|
|
|
|
attribute);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case PROP_FOREGROUND_GDK:
|
|
|
|
break;
|
|
|
|
case PROP_STRIKETHROUGH:
|
|
|
|
attribute = pango_attr_strikethrough_new (g_value_get_boolean (value));
|
|
|
|
attribute->start_index = 0;
|
|
|
|
attribute->end_index = G_MAXINT;
|
|
|
|
pango_attr_list_change (celltext->attr_list,
|
|
|
|
attribute);
|
|
|
|
break;
|
|
|
|
case PROP_UNDERLINE:
|
|
|
|
celltext->underline = g_value_get_boolean (value);
|
|
|
|
attribute = pango_attr_underline_new (celltext->underline ?
|
|
|
|
PANGO_UNDERLINE_SINGLE :
|
|
|
|
PANGO_UNDERLINE_NONE);
|
|
|
|
attribute->start_index = 0;
|
|
|
|
attribute->end_index = G_MAXINT;
|
|
|
|
pango_attr_list_change (celltext->attr_list,
|
|
|
|
attribute);
|
|
|
|
break;
|
|
|
|
case PROP_EDITABLE:
|
|
|
|
break;
|
|
|
|
case PROP_ITALIC:
|
|
|
|
attribute = pango_attr_style_new (g_value_get_boolean (value) ?
|
|
|
|
PANGO_STYLE_ITALIC :
|
|
|
|
PANGO_STYLE_NORMAL);
|
|
|
|
attribute->start_index = 0;
|
|
|
|
attribute->end_index = G_MAXINT;
|
|
|
|
pango_attr_list_change (celltext->attr_list,
|
|
|
|
attribute);
|
|
|
|
break;
|
|
|
|
case PROP_BOLD:
|
|
|
|
attribute = pango_attr_weight_new (g_value_get_boolean (value) ?
|
|
|
|
PANGO_WEIGHT_BOLD :
|
|
|
|
PANGO_WEIGHT_NORMAL);
|
|
|
|
attribute->start_index = 0;
|
|
|
|
attribute->end_index = G_MAXINT;
|
|
|
|
pango_attr_list_change (celltext->attr_list,
|
|
|
|
attribute);
|
|
|
|
break;
|
|
|
|
default:
|
2000-12-12 07:32:32 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
|
2000-10-05 01:04:57 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkCellRenderer *
|
|
|
|
gtk_cell_renderer_text_new (void)
|
|
|
|
{
|
|
|
|
return GTK_CELL_RENDERER (gtk_type_new (gtk_cell_renderer_text_get_type ()));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
|
|
|
|
GtkWidget *widget,
|
|
|
|
gint *width,
|
|
|
|
gint *height)
|
|
|
|
{
|
|
|
|
GtkCellRendererText *celltext = (GtkCellRendererText *)cell;
|
|
|
|
PangoRectangle rect;
|
|
|
|
PangoLayout *layout;
|
|
|
|
PangoAttribute *attr;
|
|
|
|
PangoUnderline underline;
|
|
|
|
|
|
|
|
layout = gtk_widget_create_pango_layout (widget, celltext->text);
|
|
|
|
underline = celltext->underline ?
|
|
|
|
PANGO_UNDERLINE_DOUBLE :
|
|
|
|
PANGO_UNDERLINE_NONE;
|
|
|
|
|
|
|
|
attr = pango_attr_underline_new (underline);
|
|
|
|
attr->start_index = 0;
|
|
|
|
attr->end_index = G_MAXINT;
|
|
|
|
|
|
|
|
pango_attr_list_change (celltext->attr_list, attr);
|
|
|
|
pango_layout_set_attributes (layout, celltext->attr_list);
|
|
|
|
pango_layout_set_width (layout, -1);
|
|
|
|
pango_layout_get_pixel_extents (layout, NULL, &rect);
|
|
|
|
|
|
|
|
if (width)
|
|
|
|
*width = GTK_CELL_RENDERER (celltext)->xpad * 2 + rect.width;
|
|
|
|
|
|
|
|
if (height)
|
|
|
|
*height = GTK_CELL_RENDERER (celltext)->ypad * 2 + rect.height;
|
|
|
|
|
|
|
|
g_object_unref (G_OBJECT (layout));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_renderer_text_render (GtkCellRenderer *cell,
|
|
|
|
GdkWindow *window,
|
|
|
|
GtkWidget *widget,
|
|
|
|
GdkRectangle *background_area,
|
|
|
|
GdkRectangle *cell_area,
|
|
|
|
GdkRectangle *expose_area,
|
|
|
|
guint flags)
|
|
|
|
|
|
|
|
{
|
|
|
|
GtkCellRendererText *celltext = (GtkCellRendererText *) cell;
|
|
|
|
PangoRectangle rect;
|
|
|
|
PangoLayout *layout;
|
|
|
|
PangoAttribute *attr;
|
|
|
|
PangoUnderline underline;
|
Adapt to uscore-ification of gtktextiterprivate
2001-01-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c: Adapt to uscore-ification of gtktextiterprivate
* gtk/gtktextdisplay.c (gtk_text_layout_draw): remove use
of private functions; remove inclusion of private headers.
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_line): Add this
function, so we don't need private functions in gtktextdisplay.c
* gtk/gtktextiterprivate.h: underscore-ification
* gtk/gtkwidget.c: Clean up a bunch of docs that said "INTERNAL"
to instead say "only useful to implement widgets"
* gtk/gtkenums.h (GtkMovementStep): Rename GTK_MOVEMENT_CHARS,
GTK_MOVEMENT_POSITIONS to GTK_MOVEMENT_LOGICAL_POSITIONS,
GTK_MOVEMENT_VISUAL_POSITIONS. Resolves bug 40249.
* gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_set_colormap):
This function was completely broken
* gtk/testtext.c (line_numbers_expose): use gtk_paint_layout
* gtk/gtkvscale.c (gtk_vscale_draw_value): use gtk_paint_layout
* gtk/gtkvruler.c (gtk_vruler_draw_ticks): use gtk_paint_layout
* gtk/gtklabel.c (gtk_label_expose): use gtk_paint_layout
* gtk/gtkhscale.c (gtk_hscale_draw_value): use gtk_paint_layout
* gtk/gtkhruler.c (gtk_hruler_draw_ticks): use gtk_paint_layout
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): use
gtk_paint_layout
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): use
gtk_paint_layout
* gtk/gtkstyle.h: Add draw/paint expander to draw tree expanders.
Progress on bug 40103. Add draw_layout to draw a PangoLayout.
(struct _GtkStyleClass): Remove draw_cross, draw_oval, draw_ramp,
which were not implemented.
* gtk/gtktextbuffer.h (struct _GtkTextBufferClass): Add
insert_pixbuf signal. Rename delete_text to delete_range since it
also deletes pixbufs and child anchors. This almost closes bug
40245 (still need to deal with child anchors)
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add
insert_pixbuf, change signal names as appropriate, change types of
signals taking marks/tags to have the specific type, not just
G_TYPE_OBJECT
* gtk/gtkmain.c (gtk_get_current_event_state): Add this function;
closes bug 40051
* gtk/gtkoptionmenu.c (gtk_option_menu_set_history): clean up
unnecessary remove_contents() call
(gtk_option_menu_class_init): add a "changed" signal, closes
bug 40039
(gtk_option_menu_update_contents): emit "changed" if the
active menu item changes
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done): fix bad
cast to GtkObject, reported by Jonas Borgstrom
(gdk_pixbuf_loader_finalize): don't close the loader on finalize;
we can't do stuff with side effects in finalize. Instead, spew a
warning if the loader isn't closed.
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_finalize): free
colormap in here, non-X ports probably need to sync to this change
* gdk/x11/gdkdrawable-x11.c (gdk_x11_set_colormap): remove
assertion that colormap != NULL, you can set the colormap to NULL
if you like.
* Makefile.am: remove gtk-config-2.0
* configure.in: Use pkg-config to locate GLib. Remove
separated-out GMODULE_LIBS, GMODULE_CFLAGS; these were not used,
and the gmodule libs/cflags were in GLIB_LIBS GLIB_CFLAGS anyhow.
Use pkg-config to locate Pango. Output correct Pango libs to
gdk-2.0.pc.in. Fix test for FREETYPE_CONFIG (typo fix).
* Makefile.am (pkgconfig_DATA): install only target-specific pc
files
(install-data-local): symlink gtk+-2.0.pc and gdk-2.0.pc to the
X11 pc files
* gtk+-2.0.pc.in (Requires): require the GDK for the current target
unref from here
2001-01-04 17:48:43 +00:00
|
|
|
GtkStateType state;
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
gint real_xoffset;
|
|
|
|
gint real_yoffset;
|
|
|
|
|
|
|
|
layout = gtk_widget_create_pango_layout (widget, celltext->text);
|
|
|
|
|
|
|
|
if (celltext->underline)
|
|
|
|
underline = PANGO_UNDERLINE_SINGLE;
|
|
|
|
else
|
|
|
|
underline = PANGO_UNDERLINE_NONE;
|
|
|
|
|
|
|
|
attr = pango_attr_underline_new (underline);
|
|
|
|
attr->start_index = 0;
|
|
|
|
attr->end_index = G_MAXINT;
|
|
|
|
pango_attr_list_change (celltext->attr_list, attr);
|
|
|
|
pango_layout_set_attributes (layout, celltext->attr_list);
|
|
|
|
|
|
|
|
pango_layout_set_width (layout, -1);
|
|
|
|
pango_layout_get_pixel_extents (layout, NULL, &rect);
|
|
|
|
|
|
|
|
if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT)
|
|
|
|
underline = (celltext->underline) ? PANGO_UNDERLINE_DOUBLE:PANGO_UNDERLINE_SINGLE;
|
|
|
|
else
|
|
|
|
underline = (celltext->underline) ? PANGO_UNDERLINE_SINGLE:PANGO_UNDERLINE_NONE;
|
|
|
|
|
|
|
|
attr = pango_attr_underline_new (underline);
|
|
|
|
attr->start_index = 0;
|
|
|
|
attr->end_index = G_MAXINT;
|
|
|
|
pango_attr_list_change (celltext->attr_list, attr);
|
|
|
|
pango_layout_set_attributes (layout, celltext->attr_list);
|
|
|
|
|
|
|
|
real_xoffset = cell->xalign * (cell_area->width - rect.width - (2 * cell->xpad));
|
|
|
|
real_xoffset = MAX (real_xoffset, 0) + cell->xpad;
|
|
|
|
real_yoffset = cell->yalign * (cell_area->height - rect.height - (2 * cell->ypad));
|
|
|
|
real_yoffset = MAX (real_yoffset, 0) + cell->ypad;
|
|
|
|
|
Adapt to uscore-ification of gtktextiterprivate
2001-01-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c: Adapt to uscore-ification of gtktextiterprivate
* gtk/gtktextdisplay.c (gtk_text_layout_draw): remove use
of private functions; remove inclusion of private headers.
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_line): Add this
function, so we don't need private functions in gtktextdisplay.c
* gtk/gtktextiterprivate.h: underscore-ification
* gtk/gtkwidget.c: Clean up a bunch of docs that said "INTERNAL"
to instead say "only useful to implement widgets"
* gtk/gtkenums.h (GtkMovementStep): Rename GTK_MOVEMENT_CHARS,
GTK_MOVEMENT_POSITIONS to GTK_MOVEMENT_LOGICAL_POSITIONS,
GTK_MOVEMENT_VISUAL_POSITIONS. Resolves bug 40249.
* gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_set_colormap):
This function was completely broken
* gtk/testtext.c (line_numbers_expose): use gtk_paint_layout
* gtk/gtkvscale.c (gtk_vscale_draw_value): use gtk_paint_layout
* gtk/gtkvruler.c (gtk_vruler_draw_ticks): use gtk_paint_layout
* gtk/gtklabel.c (gtk_label_expose): use gtk_paint_layout
* gtk/gtkhscale.c (gtk_hscale_draw_value): use gtk_paint_layout
* gtk/gtkhruler.c (gtk_hruler_draw_ticks): use gtk_paint_layout
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): use
gtk_paint_layout
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): use
gtk_paint_layout
* gtk/gtkstyle.h: Add draw/paint expander to draw tree expanders.
Progress on bug 40103. Add draw_layout to draw a PangoLayout.
(struct _GtkStyleClass): Remove draw_cross, draw_oval, draw_ramp,
which were not implemented.
* gtk/gtktextbuffer.h (struct _GtkTextBufferClass): Add
insert_pixbuf signal. Rename delete_text to delete_range since it
also deletes pixbufs and child anchors. This almost closes bug
40245 (still need to deal with child anchors)
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add
insert_pixbuf, change signal names as appropriate, change types of
signals taking marks/tags to have the specific type, not just
G_TYPE_OBJECT
* gtk/gtkmain.c (gtk_get_current_event_state): Add this function;
closes bug 40051
* gtk/gtkoptionmenu.c (gtk_option_menu_set_history): clean up
unnecessary remove_contents() call
(gtk_option_menu_class_init): add a "changed" signal, closes
bug 40039
(gtk_option_menu_update_contents): emit "changed" if the
active menu item changes
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done): fix bad
cast to GtkObject, reported by Jonas Borgstrom
(gdk_pixbuf_loader_finalize): don't close the loader on finalize;
we can't do stuff with side effects in finalize. Instead, spew a
warning if the loader isn't closed.
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_finalize): free
colormap in here, non-X ports probably need to sync to this change
* gdk/x11/gdkdrawable-x11.c (gdk_x11_set_colormap): remove
assertion that colormap != NULL, you can set the colormap to NULL
if you like.
* Makefile.am: remove gtk-config-2.0
* configure.in: Use pkg-config to locate GLib. Remove
separated-out GMODULE_LIBS, GMODULE_CFLAGS; these were not used,
and the gmodule libs/cflags were in GLIB_LIBS GLIB_CFLAGS anyhow.
Use pkg-config to locate Pango. Output correct Pango libs to
gdk-2.0.pc.in. Fix test for FREETYPE_CONFIG (typo fix).
* Makefile.am (pkgconfig_DATA): install only target-specific pc
files
(install-data-local): symlink gtk+-2.0.pc and gdk-2.0.pc to the
X11 pc files
* gtk+-2.0.pc.in (Requires): require the GDK for the current target
unref from here
2001-01-04 17:48:43 +00:00
|
|
|
if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
|
|
|
|
state = GTK_STATE_SELECTED;
|
|
|
|
else
|
|
|
|
state = GTK_STATE_NORMAL;
|
|
|
|
|
|
|
|
gtk_paint_layout (widget->style,
|
|
|
|
window,
|
|
|
|
state,
|
|
|
|
cell_area,
|
|
|
|
widget,
|
|
|
|
"cellrenderertext",
|
|
|
|
cell_area->x + real_xoffset,
|
|
|
|
cell_area->y + real_yoffset,
|
|
|
|
layout);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
g_object_unref (G_OBJECT (layout));
|
|
|
|
}
|