Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-24 00:54:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

only override BITMAP size for monobitmap

Browse Source
This commit is contained in:
Vincent Wei
2019-03-04 16:58:08 +08:00
parent 3b61f25bb5
commit ebf765f4ad
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/font/freetype2.c
+3 -3
View File
@@ -511,7 +511,7 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
if (pitch)
*pitch = cacheinfo->pitch;
if (sz) {
if (!is_grey && sz) {
sz->cx = cacheinfo->width;
sz->cy = cacheinfo->height;
}
@@ -592,7 +592,7 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
pcache->flag = TRUE;
}
if (sz) {
if (!is_grey && sz) {
sz->cx = pcache->width;
sz->cy = pcache->height;
}
@@ -604,7 +604,7 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
buffer = get_raster_bitmap_buffer (source->rows * source->pitch);
memcpy(buffer, source->buffer, source->rows * source->pitch);
if (sz) {
if (!is_grey && sz) {
sz->cx = source->width;
sz->cy = source->rows;
}
src/newgdi/glyph.c
+6 -2
View File
@@ -1852,10 +1852,10 @@ static BOOL get_subpixel_bmp (PDC pdc, Glyph32 glyph_value, SIZE* bbx_size,
}
#endif
if (data == NULL)
{
if (data == NULL) {
data = (*devfont->font_ops->get_glyph_monobitmap) (logfont, devfont,
REAL_GLYPH(glyph_value), bbx_size, &data_pitch, &scale);
bbx_size->cx += bold;
}
if (data == NULL)
@@ -1939,6 +1939,7 @@ static BOOL get_book_bmp (PDC pdc, Glyph32 glyph_value, SIZE* bbx_size,
data = (*devfont->font_ops->get_glyph_monobitmap) (logfont, devfont,
REAL_GLYPH(glyph_value), bbx_size, &data_pitch, &scale);
bbx_size->cx += bold;
if (data == NULL)
return FALSE;
@@ -2002,6 +2003,7 @@ static BOOL get_light_bmp (PDC pdc, Glyph32 glyph_value, SIZE* bbx_size,
data = (*devfont->font_ops->get_glyph_monobitmap) (logfont, devfont,
REAL_GLYPH(glyph_value), bbx_size, &pitch, &scale);
bbx_size->cx += bold;
if (data == NULL)
return FALSE;
@@ -2090,6 +2092,7 @@ static BOOL get_regular_bmp (PDC pdc, Glyph32 glyph_value, SIZE* bbx_size,
data = (*devfont->font_ops->get_glyph_monobitmap) (logfont, devfont,
REAL_GLYPH(glyph_value), bbx_size, &pitch, &scale);
bbx_size->cx += bold;
if (!data)
return FALSE;
@@ -3737,6 +3740,7 @@ static BOOL _gdi_get_glyph_data (PDC pdc, Glyph32 glyph_value,
data = (BYTE*)(*devfont->font_ops->get_glyph_monobitmap) (logfont, devfont,
REAL_GLYPH(glyph_value), bbox, &pitch, &scale);
bbox->cx += bold;
if (data == NULL)
break;