diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-23 17:56:23 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-23 17:56:23 +1000 |
| commit | e758a60b100913fe7fa82e9751292781c0328a38 (patch) | |
| tree | 7e95c7cde2d9246f98fb006e3683e407468ba9c2 /src/gwin | |
| parent | 2b47a0708602b45b0b5db120a496bf92232aa4b1 (diff) | |
| parent | 0c7c74112e07f612ea5a2da00a5962728225d41f (diff) | |
| download | uGFX-e758a60b100913fe7fa82e9751292781c0328a38.tar.gz uGFX-e758a60b100913fe7fa82e9751292781c0328a38.tar.bz2 uGFX-e758a60b100913fe7fa82e9751292781c0328a38.zip | |
Merge branch 'gdriver' into newmouse
Diffstat (limited to 'src/gwin')
| -rw-r--r-- | src/gwin/gwin_frame.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gwin/gwin_frame.c b/src/gwin/gwin_frame.c index 63df3be2..8cb74a7d 100644 --- a/src/gwin/gwin_frame.c +++ b/src/gwin/gwin_frame.c @@ -96,7 +96,7 @@ static void forceFrameRedraw(GWidgetObject *gw) { gw->g.flags &= ~(GWIN_FRAME_CLOSE_PRESSED|GWIN_FRAME_MAX_PRESSED|GWIN_FRAME_MIN_PRESSED); forceFrameRedraw(gw); _gwinSendEvent(&gw->g, GEVENT_GWIN_CLOSE); - gwinDestroy(&gw->g); + _gwinDestroy(&gw->g, REDRAW_INSESSION); return; } if ((gw->g.flags & GWIN_FRAME_MAX_PRESSED)) { @@ -128,6 +128,7 @@ static void forceFrameRedraw(GWidgetObject *gw) { // Close is released - destroy the window. This is tricky as we already have the drawing lock. gw->g.flags &= ~(GWIN_FRAME_CLOSE_PRESSED|GWIN_FRAME_MAX_PRESSED|GWIN_FRAME_MIN_PRESSED); forceFrameRedraw(gw); + _gwinSendEvent(&gw->g, GEVENT_GWIN_CLOSE); _gwinDestroy(&gw->g, REDRAW_INSESSION); return; } @@ -308,7 +309,7 @@ void gwinFrameDraw_Std(GWidgetObject *gw, void *param) { for(y = gw->g.y+BORDER_T, ih = gi->height; y < my; y += ih) { if (ih > my - y) ih = my - y; - for(x = gw->g.x+BORDER_L; iw = gi->width; x < mx; x += iw) { + for(x = gw->g.x+BORDER_L, iw = gi->width; x < mx; x += iw) { if (iw > mx - x) iw = mx - x; gdispGImageDraw(gw->g.display, gi, x, y, ih, iw, 0, 0); |