Fix support_gfx font load order

This commit is contained in:
Joonas Javanainen 2018-10-12 23:56:46 +03:00
parent 578eaf7373
commit c1e4641b2f
No known key found for this signature in database
GPG Key ID: D39CCA5CB19B9179

View File

@ -66,9 +66,17 @@ pub fn run<F: FnMut(&Ui) -> bool>(title: String, clear_color: [f32; 4], mut run_
let font_size = (13.0 * hidpi_factor) as f32;
imgui.fonts().add_default_font_with_config(
ImFontConfig::new()
.oversample_h(1)
.pixel_snap_h(true)
.size_pixels(font_size),
);
imgui.fonts().add_font_with_config(
include_bytes!("../mplus-1p-regular.ttf"),
ImFontConfig::new()
.merge_mode(true)
.oversample_h(1)
.pixel_snap_h(true)
.size_pixels(font_size)
@ -76,14 +84,6 @@ pub fn run<F: FnMut(&Ui) -> bool>(title: String, clear_color: [f32; 4], mut run_
&FontGlyphRange::japanese(),
);
imgui.fonts().add_default_font_with_config(
ImFontConfig::new()
.merge_mode(true)
.oversample_h(1)
.pixel_snap_h(true)
.size_pixels(font_size),
);
imgui.set_font_global_scale((1.0 / hidpi_factor) as f32);
let mut renderer = Renderer::init(&mut imgui, &mut factory, shaders, main_color.clone())