angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 06:57:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Button and ToggleButton: Threat Unicode surrogate character pair as single character and make button square (issue #234)

Browse Source
This commit is contained in:
Karl Tauber
2021-01-09 23:46:56 +01:00
parent 1d06a2c2e8
commit 7d48bf06fe
4 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java
View File

@@ -251,7 +251,10 @@ public class FlatButtonUI
Icon icon = ((AbstractButton)c).getIcon();
String text = ((AbstractButton)c).getText();
return (icon != null && (text == null || text.isEmpty())) ||
(icon == null && text != null && ("...".equals( text ) || text.length() == 1));
(icon == null && text != null &&
("...".equals( text ) ||
text.length() == 1 ||
(text.length() == 2 && Character.isSurrogatePair( text.charAt( 0 ), text.charAt( 1 ) ))));
}
static final int TYPE_OTHER = -1;