KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Vertically center CSD title

Browse Source
This commit is contained in:
Kovid Goyal 2021-04-01 10:34:22 +05:30
parent 5d496216e0
commit 5c6e55d37f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/freetype_render_ui_text.c
View File

@ -129,9 +129,9 @@ choose_bitmap_size(FT_Face face, FT_UInt desired_height) {
} }
static void static void
set_pixel_size(Face *face, FT_UInt sz, bool has_color) { set_pixel_size(Face *face, FT_UInt sz) {
if (sz != face->pixel_size) { if (sz != face->pixel_size) {
if (has_color) sz = choose_bitmap_size(face->freetype, font_units_to_pixels_y(main_face.freetype, main_face.freetype->height)); if (FT_HAS_COLOR(face->freetype)) sz = choose_bitmap_size(face->freetype, font_units_to_pixels_y(main_face.freetype, main_face.freetype->height));
else FT_Set_Pixel_Sizes(face->freetype, sz, sz); else FT_Set_Pixel_Sizes(face->freetype, sz, sz);
hb_ft_font_changed(face->hb); hb_ft_font_changed(face->hb);
hb_ft_font_set_load_flags(face->hb, get_load_flags(face->hinting, face->hintstyle, FT_LOAD_DEFAULT)); hb_ft_font_set_load_flags(face->hb, get_load_flags(face->hinting, face->hintstyle, FT_LOAD_DEFAULT));
@ -229,7 +229,7 @@ render_run(RenderState *rs) {
FT_Face face = rs->current_face->freetype; FT_Face face = rs->current_face->freetype;
bool has_color = FT_HAS_COLOR(face); bool has_color = FT_HAS_COLOR(face);
FT_UInt pixel_size = rs->sz_px; FT_UInt pixel_size = rs->sz_px;
set_pixel_size(rs->current_face, pixel_size, has_color); set_pixel_size(rs->current_face, pixel_size);
hb_shape(rs->current_face->hb, hb_buffer, NULL, 0); hb_shape(rs->current_face->hb, hb_buffer, NULL, 0);
unsigned int len = hb_buffer_get_length(hb_buffer); unsigned int len = hb_buffer_get_length(hb_buffer);
hb_glyph_info_t *info = hb_buffer_get_glyph_infos(hb_buffer, NULL); hb_glyph_info_t *info = hb_buffer_get_glyph_infos(hb_buffer, NULL);
@ -342,6 +342,9 @@ render_single_line(const char *text, unsigned sz_px, pixel fg, pixel bg, uint8_t
if (!unicode) { PyErr_NoMemory(); return false; } if (!unicode) { PyErr_NoMemory(); return false; }
bool ok = false; bool ok = false;
text_len = decode_utf8_string(text, text_len, unicode); text_len = decode_utf8_string(text, text_len, unicode);
set_pixel_size(&main_face, sz_px);
unsigned text_height = font_units_to_pixels_y(main_face.freetype, main_face.freetype->height);
if (text_height < height) y_offset -= (height - text_height) / 2;
RenderState rs = { RenderState rs = {
.current_face = &main_face, .fg = fg, .bg = bg, .output_width = width, .output_height = height, .current_face = &main_face, .fg = fg, .bg = bg, .output_width = width, .output_height = height,
.output = (pixel*)output_buf, .x = x_offset, .y = y_offset, .sz_px = sz_px .output = (pixel*)output_buf, .x = x_offset, .y = y_offset, .sz_px = sz_px