AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only apply icon padding to the left and right side of the icon.

Browse Source 
git-svn-id: https://samskivert.googlecode.com/svn/trunk@1130 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
ray
2003-05-14 01:52:52 +00:00
parent 51eb251fba
commit 2653de3aa1
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/samskivert/src/java/com/samskivert/swing/LabelSausage.java
+9 -6
View File
@@ -1,5 +1,5 @@
// //
// $Id: LabelSausage.java,v 1.2 2003/05/12 16:13:15 mdb Exp $ // $Id: LabelSausage.java,v 1.3 2003/05/14 01:52:52 ray Exp $
package com.samskivert.swing; package com.samskivert.swing;
@@ -38,6 +38,9 @@ public abstract class LabelSausage
/** /**
* Lays out the label sausage. It is assumed that the desired label * Lays out the label sausage. It is assumed that the desired label
* font is already set in the label. * font is already set in the label.
*
* @param iconPadding the number of pixels in the x direction to pad
* around the icon.
*/ */
protected void layout (Graphics2D gfx, int iconPadding, int extraPadding) protected void layout (Graphics2D gfx, int iconPadding, int extraPadding)
{ {
@@ -48,8 +51,8 @@ public abstract class LabelSausage
sqwid = sqhei = 0; sqwid = sqhei = 0;
} else { } else {
sqwid = _icon.getIconWidth() + 2*iconPadding; sqwid = _icon.getIconWidth();
sqhei = _icon.getIconHeight() + 2*iconPadding; sqhei = _icon.getIconHeight();
_label.setTargetHeight(sqhei); _label.setTargetHeight(sqhei);
} }
@@ -87,10 +90,10 @@ public abstract class LabelSausage
// and if we are actually rendering the icon, we need to // and if we are actually rendering the icon, we need to
// account for the space between it and the label. // account for the space between it and the label.
if (_icon != null) { if (_icon != null) {
_size.width += _xoff; // and add the padding needed for the icon
// also account for our icon padding _size.width += _xoff + (iconPadding * 2);
_xoff += iconPadding; _xoff += iconPadding;
_yoff += iconPadding; _lxoff += iconPadding * 2;
} }
} }