From 9fd65f6091fbbb35782f0c307d3a7791714aadc9 Mon Sep 17 00:00:00 2001 From: mdb Date: Thu, 20 Dec 2001 02:00:12 +0000 Subject: [PATCH] git-svn-id: https://samskivert.googlecode.com/svn/trunk@530 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../samskivert/src/java/com/samskivert/swing/Label.java | 7 ++++--- .../tests/src/java/com/samskivert/swing/LabelDemo.java | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/swing/Label.java b/projects/samskivert/src/java/com/samskivert/swing/Label.java index 1d18366e..6ab58d91 100644 --- a/projects/samskivert/src/java/com/samskivert/swing/Label.java +++ b/projects/samskivert/src/java/com/samskivert/swing/Label.java @@ -1,5 +1,5 @@ // -// $Id: Label.java,v 1.3 2001/12/19 07:21:58 mdb Exp $ +// $Id: Label.java,v 1.4 2001/12/20 02:00:12 mdb Exp $ package com.samskivert.swing; @@ -222,9 +222,10 @@ public class Label implements SwingConstants TextLayout layout = _layouts[i]; y += layout.getAscent(); - float dx = 0, extra = _size.width - layout.getAdvance(); + float dx = 0, extra = (float) + (_size.width - layout.getBounds().getWidth()); switch (_align) { - case -1: dx = layout.isLeftToRight() ? extra : 0; break; + case -1: dx = layout.isLeftToRight() ? 0 : extra; break; case LEFT: dx = 0; break; case RIGHT: dx = extra; break; case CENTER: dx = extra/2; break; diff --git a/projects/samskivert/tests/src/java/com/samskivert/swing/LabelDemo.java b/projects/samskivert/tests/src/java/com/samskivert/swing/LabelDemo.java index e21c87f3..7d0ff948 100644 --- a/projects/samskivert/tests/src/java/com/samskivert/swing/LabelDemo.java +++ b/projects/samskivert/tests/src/java/com/samskivert/swing/LabelDemo.java @@ -1,5 +1,5 @@ // -// $Id: LabelDemo.java,v 1.1 2001/12/19 07:02:50 mdb Exp $ +// $Id: LabelDemo.java,v 1.2 2001/12/20 02:00:12 mdb Exp $ package com.samskivert.swing; @@ -21,10 +21,12 @@ public class LabelDemo extends JPanel _labelOne = new Label(text); _labelOne.setFont(font); _labelOne.setTargetWidth(100); + _labelOne.setAlignment(Label.RIGHT); _labelTwo = new Label(text); _labelTwo.setFont(font); _labelTwo.setTargetHeight(30); + _labelTwo.setAlignment(Label.CENTER); } public void layout ()