pre-rendering must happen after layout
This commit is contained in:
parent
ace91f04af
commit
6d7546aa8c
@ -11,7 +11,7 @@ from .fast_data_types import (
|
||||
GLFW_KEY_DOWN, GLFW_KEY_UP, ChildMonitor, destroy_global_data,
|
||||
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 .session import create_session
|
||||
from .tabs import SpecialWindow, TabManager
|
||||
@ -24,6 +24,7 @@ from .window import load_shader_programs
|
||||
def initialize_renderer():
|
||||
load_shader_programs()
|
||||
layout_sprite_map(cell_size.width, cell_size.height)
|
||||
prerender()
|
||||
|
||||
|
||||
class DumpCommands: # {{{
|
||||
@ -144,6 +145,7 @@ class Boss:
|
||||
windows = tuple(filter(None, self.window_id_map.values()))
|
||||
cell_size.width, cell_size.height = resize_fonts(self.current_font_size)
|
||||
layout_sprite_map(cell_size.width, cell_size.height)
|
||||
prerender()
|
||||
for window in windows:
|
||||
window.screen.rescale_images(w, h)
|
||||
self.resize_windows_after_font_size_change()
|
||||
|
||||
@ -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,
|
||||
underline_position, underline_thickness
|
||||
)
|
||||
prerender()
|
||||
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,
|
||||
underline_position, underline_thickness
|
||||
)
|
||||
prerender()
|
||||
|
||||
|
||||
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)
|
||||
set_send_sprite_to_gpu(send_to_gpu)
|
||||
cell_width, cell_height = set_font_family(opts, override_dpi=(dpi, dpi), override_font_size=size)
|
||||
prerender()
|
||||
return sprites, cell_width, cell_height
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user