Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Fix broken scroll lock icon, refresh preview upon closing a tab
| Author | DaveJarvis <email> |
|---|---|
| Date | 2021-10-03 16:23:59 GMT-0700 |
| Commit | 815368cf4997493b4dae500f8fc00d8b10c32715 |
| Parent | 77c7890 |
| Delta | 28 lines added, 3 lines removed, 25-line increase |
src/main/java/com/keenwrite/ui/fonts/IconFactory.java
| import static com.keenwrite.preview.SvgRasterizer.BROKEN_IMAGE_PLACEHOLDER; | ||
| import static com.keenwrite.preview.SvgRasterizer.rasterize; | ||
| -import static java.awt.Font.BOLD; | ||
| +import static java.awt.Font.*; | ||
| import static java.nio.file.Files.readAttributes; | ||
| import static javafx.embed.swing.SwingFXUtils.toFXImage; | ||
 | ||
| } | ||
| - if(extension == null) { | ||
| + if( extension == null ) { | ||
| extension = ""; | ||
| } | ||
| ||
| } | ||
| + /** | ||
| + * Returns the font to use when adding icons to the UI. | ||
| + * | ||
| + * @param size The font size to use when drawing the icon. | ||
| + * @return A font containing numerous icons. | ||
| + */ | ||
| public static Font getIconFont( final int size ) { | ||
| - return new Font( FONT_AWESOME.getName(), BOLD, size ); | ||
| + try( final var fontStream = openFont() ) { | ||
| + final var font = createFont( TRUETYPE_FONT, fontStream ); | ||
| + return font.deriveFont( PLAIN, size ); | ||
| + } catch( final Exception e ) { | ||
| + // This doesn't actually work, seemingly after an upgrade to ControlsFX. | ||
| + // As such, creating the font and deriving it will work. | ||
| + return new Font( FONT_AWESOME.getName(), PLAIN, size ); | ||
| + } | ||
| + } | ||
| + | ||
| + /** | ||
| + * This re-reads the {@link FontAwesome} font TTF resource. For a reason | ||
| + * not yet investigated, the font doesn't appear to be accessible to the | ||
| + * application. This may have happened during an upgrade to ControlsFX. | ||
| + * Callers are responsible for closing the stream. | ||
| + * | ||
| + * @return A stream containing font TrueType glyph information. | ||
| + */ | ||
| + private static InputStream openFont() { | ||
| + return FontAwesome.class.getResourceAsStream( "fontawesome-webfont.ttf" ); | ||
| } | ||