Merge branch 'master' of ssh://gitea.nishi.boats:2222/pyrite-dev/milsko
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
This commit is contained in:
commit
4aaecdb962
2 changed files with 1 additions and 4 deletions
|
|
@ -489,8 +489,6 @@ static void MwLLBeginDrawImpl(MwLL handle) {
|
|||
|
||||
static void MwLLEndDrawImpl(MwLL handle) {
|
||||
(void)handle;
|
||||
|
||||
XClearWindow(handle->x11.display, handle->x11.window);
|
||||
}
|
||||
|
||||
static void MwLLPolygonImpl(MwLL handle, MwPoint* points, int points_count, MwLLColor color) {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ static int ft2_MwDrawText(MwWidget handle, MwFLFont ttf, MwPoint* point, const c
|
|||
|
||||
for(cy = 0; cy < bmp->rows; cy++) {
|
||||
for(cx = 0; cx < bmp->width; cx++) {
|
||||
int ox = x + cx + (ttf->face->glyph->metrics.horiBearingX >> 6) + ttf->face->glyph->bitmap_left;
|
||||
int ox = x + cx + ttf->face->glyph->bitmap_left;
|
||||
int oy = y + (ttf->face->height * ttf->px / ttf->face->units_per_EM) - ttf->face->glyph->bitmap_top + cy + (ttf->face->descender * ttf->px / ttf->face->units_per_EM);
|
||||
unsigned char* opx = &px[(oy * tw + ox) * 4];
|
||||
opx[0] = color->common.red;
|
||||
|
|
@ -123,7 +123,6 @@ static int ft2_MwTextWidth(MwFLFont ttf, const char* text) {
|
|||
text = old_text;
|
||||
}
|
||||
|
||||
tw -= ttf->face->glyph->advance.x >> 6;
|
||||
tw += ttf->face->glyph->bitmap_left + ttf->face->glyph->bitmap.width;
|
||||
|
||||
return tw + 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue