|
 |
fa96951 |
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.rotated-text 2006-08-24 21:59:45.000000000 -0400
|
|
|
fa96951 |
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:01:21.000000000 -0400
|
|
|
fa96951 |
@@ -541,9 +541,6 @@
|
|
|
fa96951 |
PangoLayout * layout)
|
|
|
fa96951 |
{
|
|
|
fa96951 |
GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
|
|
|
fa96951 |
- PangoLayoutLine *line;
|
|
|
fa96951 |
- gint x_off, y_off;
|
|
|
fa96951 |
- gint i;
|
|
|
fa96951 |
|
|
|
fa96951 |
if (drawing->pixmap == NULL)
|
|
|
fa96951 |
return;
|
|
|
fa96951 |
@@ -557,41 +554,6 @@
|
|
|
fa96951 |
drawing->angle = angle;
|
|
|
fa96951 |
}
|
|
|
fa96951 |
|
|
|
fa96951 |
- i = 0;
|
|
|
fa96951 |
- y_off = 0;
|
|
|
fa96951 |
- for (line = pango_layout_get_line (drawing->layout, i);
|
|
|
fa96951 |
- line != NULL; line = pango_layout_get_line (drawing->layout, ++i))
|
|
|
fa96951 |
- {
|
|
|
fa96951 |
- GSList *runp;
|
|
|
fa96951 |
- PangoRectangle line_extents;
|
|
|
fa96951 |
-
|
|
|
fa96951 |
- x_off = 0;
|
|
|
fa96951 |
-
|
|
|
fa96951 |
- for (runp = line->runs; runp != NULL; runp = runp->next)
|
|
|
fa96951 |
- {
|
|
|
fa96951 |
- PangoGlyphItem *run = runp->data;
|
|
|
fa96951 |
- gint j;
|
|
|
fa96951 |
-
|
|
|
fa96951 |
- for (j = 0; j < run->glyphs->num_glyphs; j++)
|
|
|
fa96951 |
- {
|
|
|
fa96951 |
- PangoGlyphGeometry *geometry;
|
|
|
fa96951 |
- gint xx, yy;
|
|
|
fa96951 |
-
|
|
|
fa96951 |
- geometry = &run->glyphs->glyphs[j].geometry;
|
|
|
fa96951 |
-
|
|
|
fa96951 |
- rotate_coordinate (0, 0, x_off, y_off, angle, &xx, &yy;;
|
|
|
fa96951 |
- geometry->x_offset -= x_off - xx;
|
|
|
fa96951 |
- geometry->y_offset -= y_off - yy;
|
|
|
fa96951 |
-
|
|
|
fa96951 |
- x_off += geometry->width;
|
|
|
fa96951 |
- }
|
|
|
fa96951 |
- }
|
|
|
fa96951 |
-
|
|
|
fa96951 |
- pango_layout_line_get_extents (line, NULL, &line_extents);
|
|
|
fa96951 |
- y_off +=
|
|
|
fa96951 |
- line_extents.height + pango_layout_get_spacing (drawing->layout);
|
|
|
fa96951 |
- }
|
|
|
fa96951 |
-
|
|
|
fa96951 |
gdk_draw_layout (drawing->pixmap,
|
|
|
fa96951 |
GTK_WIDGET (drawing)->style->text_gc[state], x, y,
|
|
|
fa96951 |
drawing->layout);
|