@@ -130,7 +130,6 @@ FONT.pushChar = function (fontCharacterBytes, fontCharacterBits) {
130
130
}
131
131
FONT . data . characters_bytes . push ( fontCharacterBytes . slice ( 0 ) ) ;
132
132
FONT . data . characters . push ( fontCharacterBits . slice ( 0 ) ) ;
133
- FONT . draw ( FONT . data . characters . length - 1 ) ;
134
133
} ;
135
134
136
135
/**
@@ -262,7 +261,7 @@ FONT.upload = function ($progress) {
262
261
FONT . preview = function ( $el ) {
263
262
$el . empty ( ) ;
264
263
for ( let i = 0 ; i < SYM . LOGO ; i ++ ) {
265
- const url = FONT . data . character_image_urls [ i ] ;
264
+ const url = FONT . draw ( i ) ;
266
265
$el . append ( `<img src="${ url } " title="0x${ i . toString ( 16 ) } "></img>` ) ;
267
266
}
268
267
} ;
@@ -2769,6 +2768,10 @@ osd.initialize = function (callback) {
2769
2768
attach : $ ( "#fontmanager" ) ,
2770
2769
title : "OSD Font Manager" ,
2771
2770
content : $ ( "#fontmanagercontent" ) ,
2771
+ onCreated : ( ) => {
2772
+ FONT . preview ( fontPreviewElement ) ;
2773
+ LogoManager . drawPreview ( ) ;
2774
+ } ,
2772
2775
} ) ;
2773
2776
2774
2777
$ ( ".elements-container div.cf_tip" ) . attr ( "title" , i18n . getMessage ( "osdSectionHelpElements" ) ) ;
@@ -3499,15 +3502,20 @@ osd.initialize = function (callback) {
3499
3502
// init structs once, also clears current font
3500
3503
FONT . initData ( ) ;
3501
3504
3505
+ let fontPreviewNeedsReload = false ;
3502
3506
fontPresetsElement . change ( function ( ) {
3503
3507
const $font = $ ( ".fontpresets option:selected" ) ;
3504
3508
const fontver = 2 ;
3505
3509
3506
3510
$ ( ".font-manager-version-info" ) . text ( i18n . getMessage ( `osdDescribeFontVersion${ fontver } ` ) ) ;
3507
3511
$ . get ( `./resources/osd/${ fontver } /${ $font . data ( "font-file" ) } .mcm` , function ( data ) {
3508
3512
FONT . parseMCMFontFile ( data ) ;
3509
- FONT . preview ( fontPreviewElement ) ;
3510
- LogoManager . drawPreview ( ) ;
3513
+ if ( fontPreviewNeedsReload ) {
3514
+ FONT . preview ( fontPreviewElement ) ;
3515
+ LogoManager . drawPreview ( ) ;
3516
+ } else {
3517
+ fontPreviewNeedsReload = true ;
3518
+ }
3511
3519
updateOsdView ( ) ;
3512
3520
$ ( ".fontpresets option[value=-1]" ) . hide ( ) ;
3513
3521
} ) ;
0 commit comments