berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

add EsDrawRoundedRectangle

This commit is contained in:
nakst 2021-09-08 21:41:54 +01:00
parent 5a6e642fce
commit 08e889c837
4 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/test.cpp
View File

@ -131,6 +131,9 @@ int TestCanvasMessage(EsElement *, EsMessage *message) {
size_t dataBytes; size_t dataBytes;
const void *data = EsEmbeddedFileGet("test", -1, &dataBytes); const void *data = EsEmbeddedFileGet("test", -1, &dataBytes);
if (data) EsDrawVectorFile(message->painter, EsPainterBoundsClient(message->painter), data, dataBytes); if (data) EsDrawVectorFile(message->painter, EsPainterBoundsClient(message->painter), data, dataBytes);
uint32_t cornerRadii[4] = { 10, 20, 30, 40 };
EsDrawRoundedRectangle(message->painter, EsPainterBoundsClient(message->painter), 0xFF00FF00, 0xFFFF00FF, ES_RECT_1(10), cornerRadii);
} else if (message->type == ES_MSG_GET_WIDTH) { } else if (message->type == ES_MSG_GET_WIDTH) {
message->measure.width = 256; message->measure.width = 256;
} else if (message->type == ES_MSG_GET_HEIGHT) { } else if (message->type == ES_MSG_GET_HEIGHT) {

12
desktop/os.header
View File

@ -1359,17 +1359,6 @@ struct EsTextSelection {
uint32_t foreground, background; uint32_t foreground, background;
}; };
function_pointer uint32_t EsFragmentShaderCallback(int x, int y, struct EsStyledBox *box);
struct EsStyledBox {
EsRectangle bounds, clip;
uint32_t backgroundColor, backgroundColor2;
EsFragmentShaderCallback fragmentShader;
uint32_t borderColor;
EsRectangle borders;
int cornerRadiusTopLeft, cornerRadiusTopRight, cornerRadiusBottomLeft, cornerRadiusBottomRight;
};
struct EsArena { struct EsArena {
// Arenas are not thread-safe! // Arenas are not thread-safe!
// You can use different arenas in different threads, though. // You can use different arenas in different threads, though.
@ -2067,6 +2056,7 @@ function void EsDrawContent(EsPainter *painter, EsElement *element, EsRectangle
function void EsDrawInvert(EsPainter *painter, EsRectangle bounds); function void EsDrawInvert(EsPainter *painter, EsRectangle bounds);
function void EsDrawLine(EsPainter *painter, float *vertices, size_t vertexCount, EsDeviceColor color, float width, uint32_t flags); // Vertices are pairs of x,y coordinates. function void EsDrawLine(EsPainter *painter, float *vertices, size_t vertexCount, EsDeviceColor color, float width, uint32_t flags); // Vertices are pairs of x,y coordinates.
function void EsDrawRectangle(EsPainter *painter, EsRectangle bounds, EsDeviceColor mainColor, EsDeviceColor borderColor, EsRectangle borderSize); function void EsDrawRectangle(EsPainter *painter, EsRectangle bounds, EsDeviceColor mainColor, EsDeviceColor borderColor, EsRectangle borderSize);
function void EsDrawRoundedRectangle(EsPainter *painter, EsRectangle bounds, EsDeviceColor mainColor, EsDeviceColor borderColor, EsRectangle borderSize, const uint32_t *cornerRadii); // Must pass 4 corner radii in the order top left, top right, bottom left, bottom right.
function bool EsDrawStandardIcon(EsPainter *painter, uint32_t id, int size, EsRectangle region, EsDeviceColor color); function bool EsDrawStandardIcon(EsPainter *painter, uint32_t id, int size, EsRectangle region, EsDeviceColor color);
function void EsDrawPaintTarget(EsPainter *painter, EsPaintTarget *source, EsRectangle destinationRegion, EsRectangle sourceRegion, uint8_t alpha); function void EsDrawPaintTarget(EsPainter *painter, EsPaintTarget *source, EsRectangle destinationRegion, EsRectangle sourceRegion, uint8_t alpha);
function void EsDrawText(EsPainter *painter, EsTextPlan *plan, EsRectangle bounds, EsRectangle *clip = ES_NULL, EsTextSelection *selectionProperties = ES_NULL); function void EsDrawText(EsPainter *painter, EsTextPlan *plan, EsRectangle bounds, EsRectangle *clip = ES_NULL, EsTextSelection *selectionProperties = ES_NULL);

33
desktop/theme.cpp
View File

@ -67,6 +67,10 @@
#define THEME_CHILD_TYPE_NONE (3) #define THEME_CHILD_TYPE_NONE (3)
#define THEME_CHILD_TYPE_HORIZONTAL (1 << 4) #define THEME_CHILD_TYPE_HORIZONTAL (1 << 4)
#ifndef IN_DESIGNER
typedef uint32_t (*EsFragmentShaderCallback)(int x, int y, struct EsStyledBox *box);
#endif
typedef enum ThemeCursor { typedef enum ThemeCursor {
THEME_CURSOR_NORMAL, THEME_CURSOR_NORMAL,
THEME_CURSOR_TEXT, THEME_CURSOR_TEXT,
@ -2182,6 +2186,15 @@ bool UIStyle::IsRegionCompletelyOpaque(EsRectangle region, int width, int height
&& region.t >= opaqueInsets.t && region.b < height - opaqueInsets.b; && region.t >= opaqueInsets.t && region.b < height - opaqueInsets.b;
} }
struct EsStyledBox {
EsRectangle bounds, clip;
uint32_t backgroundColor, backgroundColor2;
EsFragmentShaderCallback fragmentShader;
uint32_t borderColor;
EsRectangle borders;
int cornerRadiusTopLeft, cornerRadiusTopRight, cornerRadiusBottomLeft, cornerRadiusBottomRight;
};
void DrawStyledBox(EsPainter *painter, EsStyledBox box) { void DrawStyledBox(EsPainter *painter, EsStyledBox box) {
ThemeLayer layer = {}; ThemeLayer layer = {};
ThemeLayerBox layerBox = {}; ThemeLayerBox layerBox = {};
@ -2223,4 +2236,24 @@ void DrawStyledBox(EsPainter *painter, EsStyledBox box) {
ThemeDrawBox(painter, box.bounds, &data, 1, &layer, {}, THEME_CHILD_TYPE_ONLY); ThemeDrawBox(painter, box.bounds, &data, 1, &layer, {}, THEME_CHILD_TYPE_ONLY);
} }
void EsDrawRoundedRectangle(EsPainter *painter, EsRectangle bounds, EsDeviceColor mainColor, EsDeviceColor borderColor, EsRectangle borderSize, const uint32_t *cornerRadii) {
ThemeLayer layer = {};
uint8_t info[sizeof(ThemeLayerBox) + sizeof(ThemePaintSolid) * 2];
ThemeLayerBox *infoBox = (ThemeLayerBox *) info;
infoBox->borders = { (int8_t) borderSize.l, (int8_t) borderSize.r, (int8_t) borderSize.t, (int8_t) borderSize.b };
infoBox->corners = { (int8_t) cornerRadii[0], (int8_t) cornerRadii[1], (int8_t) cornerRadii[2], (int8_t) cornerRadii[3] };
infoBox->mainPaintType = THEME_PAINT_SOLID;
infoBox->borderPaintType = THEME_PAINT_SOLID;
ThemePaintSolid *infoMain = (ThemePaintSolid *) (infoBox + 1);
infoMain->color = mainColor;
ThemePaintSolid *infoBorder = (ThemePaintSolid *) (infoMain + 1);
infoBorder->color = borderColor;
EsBuffer data = { .in = (const uint8_t *) &info, .bytes = sizeof(info) };
ThemeDrawBox(painter, bounds, &data, 1, &layer, {}, THEME_CHILD_TYPE_ONLY);
}
#endif #endif

1
util/api_table.ini
View File

@ -439,3 +439,4 @@ EsUserTaskIsRunning=437
EsTextboxSetFont=438 EsTextboxSetFont=438
EsTextboxSetTextSize=439 EsTextboxSetTextSize=439
EsRectangleLinearInterpolate=440 EsRectangleLinearInterpolate=440
EsDrawRoundedRectangle=441