dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added more font glyphs to font size detection. Added error when L&F

Browse Source 
cannot be loaded.
This commit is contained in:
nathan 2017-02-26 11:54:52 +01:00
parent d6885798c5
commit d3bc40081d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dorkbox/util/SwingUtil.java
View File

@ -96,7 +96,7 @@ class SwingUtil {
for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) { for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
if (specified.equals(info.getName().toLowerCase(Locale.US))) { if (specified.equals(info.getName().toLowerCase(Locale.US))) {
UIManager.setLookAndFeel(info.getClassName()); UIManager.setLookAndFeel(info.getClassName());
break; return;
} }
} }
} catch (Exception e) { } catch (Exception e) {
@ -104,6 +104,9 @@ class SwingUtil {
e.printStackTrace(); e.printStackTrace();
} }
} }
// this means we couldn't find our L&F
new Exception("Could not load " + lookAndFeel + ", it was not available.").printStackTrace();
} }
/** All of the fonts in the {@link #FONTS_LOCATION} will be loaded by the Font manager */ /** All of the fonts in the {@link #FONTS_LOCATION} will be loaded by the Font manager */
@ -269,7 +272,7 @@ class SwingUtil {
Font fontCheck = new Font(font.getName(), Font.PLAIN, size); Font fontCheck = new Font(font.getName(), Font.PLAIN, size);
FontMetrics metrics = g.getFontMetrics(fontCheck); FontMetrics metrics = g.getFontMetrics(fontCheck);
Rectangle2D rect = metrics.getStringBounds("Tj|", g); // Tj| are letters that are at the top/bottom of the fontset (usually) Rectangle2D rect = metrics.getStringBounds("`Tj|┃", g); // `Tj|┃ are letters that are at the top/bottom of the fontset (usually)
int testHeight = (int) rect.getHeight(); int testHeight = (int) rect.getHeight();
if (testHeight < height && lastAction != Boolean.FALSE) { if (testHeight < height && lastAction != Boolean.FALSE) {