Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 17312) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 17313) @@ -8,4 +8,6 @@ import java.awt.Container; import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.event.MouseWheelEvent; @@ -33,5 +35,5 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; -import javax.swing.LookAndFeel; +import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.event.ChangeEvent; @@ -223,5 +225,5 @@ setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); JPanel headerPanel = new JPanel(new BorderLayout()); - add(headerPanel, GBC.eop().fill(GBC.HORIZONTAL)); + add(headerPanel, GBC.eop().fill(GridBagConstraints.HORIZONTAL)); JLabel label = new JLabel("" + @@ -474,9 +476,12 @@ */ public PreferenceTabbedPane() { - super(JTabbedPane.LEFT, JTabbedPane.SCROLL_TAB_LAYOUT); + super(SwingConstants.LEFT, JTabbedPane.SCROLL_TAB_LAYOUT); super.addMouseWheelListener(new WheelListener(this)); ExpertToggleAction.addExpertModeChangeListener(this); } + /** + * Constructs GUI. + */ public void buildGui() { Collection factories = new ArrayList<>(SETTINGS_FACTORIES); @@ -496,17 +501,17 @@ } - private void addGUITabsForSetting(Icon icon, TabPreferenceSetting tps) { + private void addGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int maxWidth) { for (PreferenceTab tab : tabs) { if (tab.getTabPreferenceSetting().equals(tps)) { - insertGUITabsForSetting(icon, tps, tab.getComponent(), getTabCount()); - } - } - } - - private int insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index) { + insertGUITabsForSetting(icon, tps, tab.getComponent(), getTabCount(), maxWidth); + } + } + } + + private int insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index, int maxWidth) { int position = index; for (PreferenceTab tab : tabs) { if (tab.getTabPreferenceSetting().equals(tps)) { - insertGUITabsForSetting(icon, tps, tab.getComponent(), position); + insertGUITabsForSetting(icon, tps, tab.getComponent(), position, maxWidth); position++; } @@ -515,13 +520,13 @@ } - private void insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, final Component component, int position) { - LookAndFeel currentLAF = UIManager.getLookAndFeel(); - if ("com.apple.laf.AquaLookAndFeel".equals(currentLAF.getClass().getName())) { - // macOS / AquaLookAndFeel does not support horizontal tabs, see https://josm.openstreetmap.de/ticket/7548#comment:80 - insertTab(null, icon, component, tps.getTooltip(), position); - } else { - String title = "
" + tps.getTitle(); - insertTab(title, icon, component, tps.getTooltip(), position); - } + private void insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, final Component component, int position, int maxWidth) { + // macOS / AquaLookAndFeel does not support horizontal tabs, see https://josm.openstreetmap.de/ticket/7548#comment:80 + String title = "Aqua".equals(UIManager.getLookAndFeel().getID()) ? null : htmlTabTitle(tps.getTitle(), maxWidth); + insertTab(title, icon, component, tps.getTooltip(), position); + } + + private String htmlTabTitle(String title, int maxWidth) { + // Width is set to force left alignment, see https://stackoverflow.com/a/33781096/2257172 + return "
" + title + "
"; } @@ -531,4 +536,6 @@ removeAll(); } + // Compute max tab length in pixels + int maxWidth = computeMaxTabWidth(); // Inspect each tab setting for (PreferenceSetting setting : settings) { @@ -539,8 +546,8 @@ if (settingsInitialized.contains(tps)) { // If it has been initialized, add corresponding tab(s) - addGUITabsForSetting(icon, tps); + addGUITabsForSetting(icon, tps, maxWidth); } else { // If it has not been initialized, create an empty tab with only icon and tooltip - insertGUITabsForSetting(icon, tps, new PreferencePanel(tps), getTabCount()); + insertGUITabsForSetting(icon, tps, new PreferencePanel(tps), getTabCount(), maxWidth); } } @@ -561,4 +568,10 @@ } setSelectedIndex(-1); + } + + private int computeMaxTabWidth() { + FontMetrics fm = getFontMetrics(getFont()); + return settings.stream().filter(x -> x instanceof TabPreferenceSetting) + .mapToInt(x -> fm.stringWidth(((TabPreferenceSetting) x).getTitle())).max().orElse(120); } @@ -665,5 +678,5 @@ Icon icon = getIconAt(index); remove(index); - if (index <= insertGUITabsForSetting(icon, preferenceSettings, index)) { + if (index <= insertGUITabsForSetting(icon, preferenceSettings, index, computeMaxTabWidth())) { setSelectedIndex(index); }