aboutsummaryrefslogtreecommitdiffstats
path: root/src/gwin
diff options
context:
space:
mode:
authorAndrew Hannam <andrewh@inmarket.com.au>2012-12-06 22:24:28 +1000
committerAndrew Hannam <andrewh@inmarket.com.au>2012-12-06 22:24:28 +1000
commitec89b8e82d890066f60c48349da062add76db6cd (patch)
tree2cf66747b0fb82e4fc45cdc141456f79ab36e86c /src/gwin
parent07f34835358ef65de310934ae726b66c7ca46f68 (diff)
downloaduGFX-ec89b8e82d890066f60c48349da062add76db6cd.tar.gz
uGFX-ec89b8e82d890066f60c48349da062add76db6cd.tar.bz2
uGFX-ec89b8e82d890066f60c48349da062add76db6cd.zip
Fixes to GWIN graph and demo
Diffstat (limited to 'src/gwin')
-rw-r--r--src/gwin/graph.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gwin/graph.c b/src/gwin/graph.c
index e950f623..581001ad 100644
--- a/src/gwin/graph.c
+++ b/src/gwin/graph.c
@@ -88,7 +88,7 @@ static void lineto(GGraphObject *gg, coord_t x0, coord_t y0, coord_t x1, coord_t
x0 += gg->gwin.x + gg->xorigin;
y0 = gg->gwin.y + gg->gwin.height - 1 - gg->yorigin - y0;
x1 += gg->gwin.x + gg->xorigin;
- y1 += gg->gwin.y + gg->gwin.height - 1 - gg->yorigin - y1;
+ y1 = gg->gwin.y + gg->gwin.height - 1 - gg->yorigin - y1;
if (style->size <= 0) {
// Use the driver to draw a solid line
@@ -235,6 +235,7 @@ void gwinGraphSetStyle(GHandle gh, const GGraphStyle *pstyle) {
gg->style.ygrid.size = pstyle->ygrid.size;
gg->style.ygrid.color = pstyle->ygrid.color;
gg->style.ygrid.spacing = pstyle->ygrid.spacing;
+ gg->style.flags = pstyle->flags;
#undef gg
}