Label: scale iconTextGap

This commit is contained in:
Karl Tauber
2019-09-15 23:14:30 +02:00
parent 89b6a4e453
commit b4b914de52

View File

@@ -17,12 +17,17 @@
package com.formdev.flatlaf.ui;
import java.awt.Color;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Rectangle;
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicLabelUI;
import com.formdev.flatlaf.util.UIScale;
/**
* Provides the Flat LaF UI delegate for {@link javax.swing.JLabel}.
@@ -72,4 +77,18 @@ public class FlatLabelUI
g.setColor( disabledForeground );
FlatUIUtils.drawStringUnderlineCharAt( l, g, s, mnemIndex, textX, textY );
}
/**
* Overridden to scale iconTextGap.
*/
@Override
protected String layoutCL( JLabel label, FontMetrics fontMetrics, String text, Icon icon, Rectangle viewR,
Rectangle iconR, Rectangle textR )
{
return SwingUtilities.layoutCompoundLabel( label, fontMetrics, text, icon,
label.getVerticalAlignment(), label.getHorizontalAlignment(),
label.getVerticalTextPosition(), label.getHorizontalTextPosition(),
viewR, iconR, textR,
UIScale.scale( label.getIconTextGap() ) );
}
}