Pushing latest.
This commit is contained in:
parent
c0d867d11e
commit
3559734d4f
2 changed files with 9 additions and 6 deletions
|
@ -528,9 +528,6 @@ static void windowPaint(struct WidgetS *widget, ...) {
|
||||||
mode = va_arg(args, int);
|
mode = va_arg(args, int);
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
|
||||||
// ***TODO*** Icon needs to be cached in a surface so we can calculate
|
|
||||||
// damaged areas for rendering.
|
|
||||||
|
|
||||||
if (mode == WINDOW_PAINT_ICONS) {
|
if (mode == WINDOW_PAINT_ICONS) {
|
||||||
// Are we minimized?
|
// Are we minimized?
|
||||||
if (w->flags & WIN_IS_ICON) {
|
if (w->flags & WIN_IS_ICON) {
|
||||||
|
@ -647,7 +644,7 @@ static WidgetT *windowWidgetFinder(WidgetT *widget, uint16_t x, uint16_t y, int1
|
||||||
br.x = *localX;
|
br.x = *localX;
|
||||||
br.y = *localY;
|
br.y = *localY;
|
||||||
w = w->reg->findWidget(w, br.x, br.y, localX, localY);
|
w = w->reg->findWidget(w, br.x, br.y, localX, localY);
|
||||||
if (w) logWrite("Over %s\n", w->reg->widgetName);
|
//if (w) logWrite("Over %s\n", w->reg->widgetName);
|
||||||
return w;
|
return w;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -978,6 +975,12 @@ void wmRender(void) {
|
||||||
arrfree(damageList);
|
arrfree(damageList);
|
||||||
|
|
||||||
} // Do we have windows?
|
} // Do we have windows?
|
||||||
|
|
||||||
|
// ***DEBUG***
|
||||||
|
surfaceSet(__guiBackBuffer);
|
||||||
|
for (i=0; i<arrlen(_windowList); i++) {
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -52,9 +52,9 @@ int main(int argc, char *argv[]) {
|
||||||
memoryStartup(argv[0]);
|
memoryStartup(argv[0]);
|
||||||
logOpenByHandle(memoryLogHandleGet());
|
logOpenByHandle(memoryLogHandleGet());
|
||||||
|
|
||||||
if (guiStartup(800, 600, 8) == SUCCESS) {
|
if (guiStartup(800, 600, 16) == SUCCESS) {
|
||||||
|
|
||||||
for (i=1; i<4; i++) {
|
for (i=1; i<2; i++) {
|
||||||
sprintf(title, "Testing %d", i);
|
sprintf(title, "Testing %d", i);
|
||||||
w = windowCreate(i * 50, i * 50, 500, 300, title, WIN_STANDARD, 640, 480);
|
w = windowCreate(i * 50, i * 50, 500, 300, title, WIN_STANDARD, 640, 480);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue