Fix frame window logic bug and compile bug
parent
fbc9ce3a45
commit
d1217112a4
|
@ -96,7 +96,7 @@ static void forceFrameRedraw(GWidgetObject *gw) {
|
||||||
gw->g.flags &= ~(GWIN_FRAME_CLOSE_PRESSED|GWIN_FRAME_MAX_PRESSED|GWIN_FRAME_MIN_PRESSED);
|
gw->g.flags &= ~(GWIN_FRAME_CLOSE_PRESSED|GWIN_FRAME_MAX_PRESSED|GWIN_FRAME_MIN_PRESSED);
|
||||||
forceFrameRedraw(gw);
|
forceFrameRedraw(gw);
|
||||||
_gwinSendEvent(&gw->g, GEVENT_GWIN_CLOSE);
|
_gwinSendEvent(&gw->g, GEVENT_GWIN_CLOSE);
|
||||||
gwinDestroy(&gw->g);
|
_gwinDestroy(&gw->g, REDRAW_INSESSION);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ((gw->g.flags & GWIN_FRAME_MAX_PRESSED)) {
|
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.
|
// 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);
|
gw->g.flags &= ~(GWIN_FRAME_CLOSE_PRESSED|GWIN_FRAME_MAX_PRESSED|GWIN_FRAME_MIN_PRESSED);
|
||||||
forceFrameRedraw(gw);
|
forceFrameRedraw(gw);
|
||||||
|
_gwinSendEvent(&gw->g, GEVENT_GWIN_CLOSE);
|
||||||
_gwinDestroy(&gw->g, REDRAW_INSESSION);
|
_gwinDestroy(&gw->g, REDRAW_INSESSION);
|
||||||
return;
|
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) {
|
for(y = gw->g.y+BORDER_T, ih = gi->height; y < my; y += ih) {
|
||||||
if (ih > my - y)
|
if (ih > my - y)
|
||||||
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)
|
if (iw > mx - x)
|
||||||
iw = mx - x;
|
iw = mx - x;
|
||||||
gdispGImageDraw(gw->g.display, gi, x, y, ih, iw, 0, 0);
|
gdispGImageDraw(gw->g.display, gi, x, y, ih, iw, 0, 0);
|
||||||
|
|
Loading…
Reference in New Issue