comparison: ui/gtk/draw_cairo.c
ui/gtk/draw_cairo.c
- changeset 115
- 102fc0b8fe3e
- parent 114
- 909fe96e5659
- child 140
- c03c338a7dcf
equal
deleted
inserted
replaced
| 114:909fe96e5659 | 115:102fc0b8fe3e |
|---|---|
| 106 | 106 |
| 107 | 107 |
| 108 void ui_draw_line(UiGraphics *g, int x1, int y1, int x2, int y2) { | 108 void ui_draw_line(UiGraphics *g, int x1, int y1, int x2, int y2) { |
| 109 UiCairoGraphics *gr = (UiCairoGraphics*)g; | 109 UiCairoGraphics *gr = (UiCairoGraphics*)g; |
| 110 cairo_set_line_width(gr->cr, 1); | 110 cairo_set_line_width(gr->cr, 1); |
| 111 cairo_move_to(gr->cr, x1, y1); | 111 cairo_move_to(gr->cr, (double)x1 + 0.5, (double)y1 + 0.5); |
| 112 cairo_line_to(gr->cr, x2, y2); | 112 cairo_line_to(gr->cr, (double)x2 + 0.5, (double)y2 + 0.5); |
| 113 cairo_stroke(gr->cr); | 113 cairo_stroke(gr->cr); |
| 114 } | 114 } |
| 115 | 115 |
| 116 void ui_draw_rect(UiGraphics *g, int x, int y, int w, int h, int fill) { | 116 void ui_draw_rect(UiGraphics *g, int x, int y, int w, int h, int fill) { |
| 117 UiCairoGraphics *gr = (UiCairoGraphics*)g; | 117 UiCairoGraphics *gr = (UiCairoGraphics*)g; |
| 118 cairo_set_line_width(gr->cr, 1); | 118 cairo_set_line_width(gr->cr, 1); |
| 119 cairo_rectangle(gr->cr, x, y, w, h); | 119 cairo_rectangle(gr->cr, x + 0.5, y + 0.5 , w, h); |
| 120 if(fill) { | 120 if(fill) { |
| 121 cairo_fill(gr->cr); | 121 cairo_fill(gr->cr); |
| 122 } else { | 122 } else { |
| 123 cairo_stroke(gr->cr); | 123 cairo_stroke(gr->cr); |
| 124 } | 124 } |
| 125 } | 125 } |
| 126 | 126 |
| 127 void ui_draw_text(UiGraphics *g, int x, int y, UiTextLayout *text) { | 127 void ui_draw_text(UiGraphics *g, int x, int y, UiTextLayout *text) { |
| 128 UiCairoGraphics *gr = (UiCairoGraphics*)g; | 128 UiCairoGraphics *gr = (UiCairoGraphics*)g; |
| 129 //gdk_draw_layout(gr->widget->window, gr->gc, x, y, text->layout); | |
| 130 cairo_move_to(gr->cr, x, y); | 129 cairo_move_to(gr->cr, x, y); |
| 131 pango_cairo_show_layout(gr->cr, text->layout); | 130 pango_cairo_show_layout(gr->cr, text->layout); |
| 132 } | 131 } |
| 133 | 132 |
