try fix font changes
Merge remote-tracking branch 'origin/master'
fix event type error