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

pre-rendering must happen after layout

Browse Source
This commit is contained in:
Kovid Goyal 2017-11-09 17:10:30 +05:30
parent ace91f04af
commit 6d7546aa8c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/boss.py
View File

@ -11,7 +11,7 @@ from .fast_data_types import (
GLFW_KEY_DOWN, GLFW_KEY_UP, ChildMonitor, destroy_global_data, GLFW_KEY_DOWN, GLFW_KEY_UP, ChildMonitor, destroy_global_data,
destroy_sprite_map, glfw_post_empty_event, layout_sprite_map destroy_sprite_map, glfw_post_empty_event, layout_sprite_map
) )
from .fonts.render import set_font_family, resize_fonts from .fonts.render import prerender, resize_fonts, set_font_family
from .keys import get_key_map, get_sent_data, get_shortcut from .keys import get_key_map, get_sent_data, get_shortcut
from .session import create_session from .session import create_session
from .tabs import SpecialWindow, TabManager from .tabs import SpecialWindow, TabManager
@ -24,6 +24,7 @@ from .window import load_shader_programs
def initialize_renderer(): def initialize_renderer():
load_shader_programs() load_shader_programs()
layout_sprite_map(cell_size.width, cell_size.height) layout_sprite_map(cell_size.width, cell_size.height)
prerender()
class DumpCommands: # {{{ class DumpCommands: # {{{
@ -144,6 +145,7 @@ class Boss:
windows = tuple(filter(None, self.window_id_map.values())) windows = tuple(filter(None, self.window_id_map.values()))
cell_size.width, cell_size.height = resize_fonts(self.current_font_size) cell_size.width, cell_size.height = resize_fonts(self.current_font_size)
layout_sprite_map(cell_size.width, cell_size.height) layout_sprite_map(cell_size.width, cell_size.height)
prerender()
for window in windows: for window in windows:
window.screen.rescale_images(w, h) window.screen.rescale_images(w, h)
self.resize_windows_after_font_size_change() self.resize_windows_after_font_size_change()

3
kitty/fonts/render.py
View File

@ -77,7 +77,6 @@ def set_font_family(opts=None, override_font_size=None, override_dpi=None):
opts.font_family, sz, xdpi, ydpi, cell_width, cell_height, baseline, opts.font_family, sz, xdpi, ydpi, cell_width, cell_height, baseline,
underline_position, underline_thickness underline_position, underline_thickness
) )
prerender()
return cell_width, cell_height return cell_width, cell_height
@ -92,7 +91,6 @@ def resize_fonts(new_sz, xdpi=None, ydpi=None):
s.family, new_sz, xdpi, ydpi, cell_width, cell_height, baseline, s.family, new_sz, xdpi, ydpi, cell_width, cell_height, baseline,
underline_position, underline_thickness underline_position, underline_thickness
) )
prerender()
def add_line(buf, cell_width, position, thickness, cell_height): def add_line(buf, cell_width, position, thickness, cell_height):
@ -188,6 +186,7 @@ def setup_for_testing(family='monospace', size=11.0, dpi=96.0):
sprite_map_set_limits(100000, 100) sprite_map_set_limits(100000, 100)
set_send_sprite_to_gpu(send_to_gpu) set_send_sprite_to_gpu(send_to_gpu)
cell_width, cell_height = set_font_family(opts, override_dpi=(dpi, dpi), override_font_size=size) cell_width, cell_height = set_font_family(opts, override_dpi=(dpi, dpi), override_font_size=size)
prerender()
return sprites, cell_width, cell_height return sprites, cell_width, cell_height