|
@@ -15,7 +15,7 @@ MODULE microuiDemo;
|
|
|
FROM SYSTEM IMPORT ADDRESS, ADR, CAST, ADDADR, BYTE;
|
|
FROM SYSTEM IMPORT ADDRESS, ADR, CAST, ADDADR, BYTE;
|
|
|
FROM tigr IMPORT TigrPtr, tigrWindow, tigrFree, tigrClosed, tigrClear,
|
|
FROM tigr IMPORT TigrPtr, tigrWindow, tigrFree, tigrClosed, tigrClear,
|
|
|
tigrUpdate, TPixelType, tfont, tigrPrint, tigrFillRect,
|
|
tigrUpdate, TPixelType, tfont, tigrPrint, tigrFillRect,
|
|
|
- tigrLine, tigrTextWidth, tigrTextHeight, tigrMouse,
|
|
|
|
|
|
|
+ tigrRect, tigrLine, tigrTextWidth, tigrTextHeight, tigrMouse,
|
|
|
tigrKeyDown, tigrKeyHeld, tigrReadChar, tigrTime,
|
|
tigrKeyDown, tigrKeyHeld, tigrReadChar, tigrTime,
|
|
|
tigrEncodeUTF8, tigrClip, tigrError,
|
|
tigrEncodeUTF8, tigrClip, tigrError,
|
|
|
TK_ESCAPE, TK_LSHIFT, TK_RSHIFT, TK_LCONTROL, TK_RCONTROL,
|
|
TK_ESCAPE, TK_LSHIFT, TK_RSHIFT, TK_LCONTROL, TK_RCONTROL,
|
|
@@ -131,6 +131,11 @@ BEGIN
|
|
|
x1 := MinI(x + w, bw);
|
|
x1 := MinI(x + w, bw);
|
|
|
y1 := MinI(y + h, bh);
|
|
y1 := MinI(y + h, bh);
|
|
|
IF (x1 > x0) AND (y1 > y0) THEN
|
|
IF (x1 > x0) AND (y1 > y0) THEN
|
|
|
|
|
+ (* tigrFillRect only fills the *interior* of a rect (it does
|
|
|
|
|
+ x+1, y+1, w-2, h-2), so pair it with tigrRect to fill the whole
|
|
|
|
|
+ rectangle - and to keep 1px-high/wide rects (microui borders). *)
|
|
|
|
|
+ tigrRect(bmp, VAL(CARDINAL, x0), VAL(CARDINAL, y0),
|
|
|
|
|
+ VAL(CARDINAL, x1 - x0), VAL(CARDINAL, y1 - y0), Pix(c));
|
|
|
tigrFillRect(bmp, VAL(CARDINAL, x0), VAL(CARDINAL, y0),
|
|
tigrFillRect(bmp, VAL(CARDINAL, x0), VAL(CARDINAL, y0),
|
|
|
VAL(CARDINAL, x1 - x0), VAL(CARDINAL, y1 - y0), Pix(c))
|
|
VAL(CARDINAL, x1 - x0), VAL(CARDINAL, y1 - y0), Pix(c))
|
|
|
END
|
|
END
|