[gtk+/refactor: 17/96] gtk/gtktextdisplay.c: use accessor functions to access GtkWidget
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/refactor: 17/96] gtk/gtktextdisplay.c: use accessor functions to access GtkWidget
- Date: Fri, 13 Aug 2010 02:29:42 +0000 (UTC)
commit 2ea81b430e8e8b10ea1fc4b571dbfddfd877c53c
Author: Javier Jardón <jjardon gnome org>
Date: Wed Aug 11 22:52:56 2010 +0200
gtk/gtktextdisplay.c: use accessor functions to access GtkWidget
gtk/gtktextdisplay.c | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 51e8adc..45b6fd9 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -179,6 +179,7 @@ gtk_text_renderer_prepare_run (PangoRenderer *renderer,
PangoLayoutRun *run)
{
GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
+ GtkStyle *style;
GdkColor *bg_color, *fg_color, *underline_color;
GtkTextAppearance *appearance;
@@ -194,15 +195,16 @@ gtk_text_renderer_prepare_run (PangoRenderer *renderer,
text_renderer_set_gdk_color (text_renderer, PANGO_RENDER_PART_BACKGROUND, bg_color);
+ style = gtk_widget_get_style (text_renderer->widget);
if (text_renderer->state == SELECTED)
{
if (gtk_widget_has_focus (text_renderer->widget))
- fg_color = &text_renderer->widget->style->text[GTK_STATE_SELECTED];
+ fg_color = &style->text[GTK_STATE_SELECTED];
else
- fg_color = &text_renderer->widget->style->text[GTK_STATE_ACTIVE];
+ fg_color = &style->text[GTK_STATE_ACTIVE];
}
else if (text_renderer->state == CURSOR && gtk_widget_has_focus (text_renderer->widget))
- fg_color = &text_renderer->widget->style->base[GTK_STATE_NORMAL];
+ fg_color = &style->base[GTK_STATE_NORMAL];
else
fg_color = &appearance->fg_color;
@@ -352,20 +354,22 @@ gtk_text_renderer_draw_shape (PangoRenderer *renderer,
int y)
{
GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
+ GtkStyle *style;
GdkColor *fg;
+ style = gtk_widget_get_style (text_renderer->widget);
if (text_renderer->state == SELECTED)
{
if (gtk_widget_has_focus (text_renderer->widget))
- fg = &text_renderer->widget->style->text[GTK_STATE_SELECTED];
+ fg = &style->text[GTK_STATE_SELECTED];
else
- fg = &text_renderer->widget->style->text[GTK_STATE_SELECTED];
+ fg = &style->text[GTK_STATE_SELECTED];
}
else if (text_renderer->state == CURSOR && gtk_widget_has_focus (text_renderer->widget))
- fg = &text_renderer->widget->style->base[GTK_STATE_NORMAL];
+ fg = &style->base[GTK_STATE_NORMAL];
else
- fg = &text_renderer->widget->style->text[GTK_STATE_NORMAL];
-
+ fg = &style->text[GTK_STATE_NORMAL];
+
if (attr->data == NULL)
{
/* This happens if we have an empty widget anchor. Draw
@@ -548,6 +552,7 @@ render_para (GtkTextRenderer *text_renderer,
int selection_start_index,
int selection_end_index)
{
+ GtkStyle *style;
PangoLayout *layout = line_display->layout;
int byte_offset = 0;
PangoLayoutIter *iter;
@@ -555,9 +560,10 @@ render_para (GtkTextRenderer *text_renderer,
int screen_width;
GdkColor *selection;
gint state;
-
gboolean first = TRUE;
+ style = gtk_widget_get_style (text_renderer->widget);
+
iter = pango_layout_get_iter (layout);
pango_layout_iter_get_layout_extents (iter, NULL, &layout_logical);
@@ -574,7 +580,7 @@ render_para (GtkTextRenderer *text_renderer,
else
state = GTK_STATE_ACTIVE;
- selection = &text_renderer->widget->style->base [state];
+ selection = &style->base [state];
do
{
@@ -763,8 +769,12 @@ render_para (GtkTextRenderer *text_renderer,
/* draw text under the cursor if any */
if (!line_display->cursor_at_line_end)
{
- gdk_cairo_set_source_color (cr,
- &text_renderer->widget->style->base[text_renderer->widget->state]);
+ GtkStateType state;
+ GtkStyle *style;
+
+ style = gtk_widget_get_style (text_renderer->widget);
+ state = gtk_widget_get_state (text_renderer->widget);
+ gdk_cairo_set_source_color (cr, &style->base[state]);
text_renderer_set_state (text_renderer, CURSOR);
@@ -846,7 +856,8 @@ gtk_text_layout_draw (GtkTextLayout *layout,
cairo_rectangle (cr, x, y, width, height);
cairo_clip (cr);
- gdk_cairo_set_source_color (cr, &widget->style->text[widget->state]);
+ gdk_cairo_set_source_color (cr,
+ >k_widget_get_style (widget)->text[gtk_widget_get_state (widget)]);
text_renderer = get_text_renderer ();
text_renderer_begin (text_renderer, widget, cr);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]