diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/Widget.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/Widget.java index a2fbd39..8e67f90 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/Widget.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/Widget.java @@ -29,7 +29,7 @@ import java.awt.event.MouseMotionListener; public class Widget extends JPanel implements GetProperty { - public static final int CLOSE_BUTTON_SIDE = 20; + private static final int CLOSE_BUTTON_SIDE = 25; protected static final Color FOREGROUND_COLOR = new Color(220, 220, 220); protected static final Color FOREGROUND_COLOR2 = new Color(210, 210, 210); protected static final Color BACKGROUND_COLOR = new Color(238, 238, 238); @@ -209,7 +209,7 @@ public class Widget extends JPanel implements brush.setColor(CLOSE_BUTTON_FOREGROUND_COLOR); Graphics2D brush2d = (Graphics2D) brush; brush2d.setStroke(new BasicStroke(2f)); - int offset = 4; + int offset = 6; brush.drawLine(width - CLOSE_BUTTON_SIDE - 1 + offset, 0 + 1 + offset, width - 0 * CLOSE_BUTTON_SIDE - 1 - offset, 0 + CLOSE_BUTTON_SIDE + 1 - offset); diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/WalkingHumanProgress.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/WalkingHumanProgress.java index 99c2b93..2e363f2 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/WalkingHumanProgress.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/WalkingHumanProgress.java @@ -78,9 +78,9 @@ public class WalkingHumanProgress extends Widget implements brush.setColor(visibility.isStronglyColored() ? Color.BLUE : visibility.isWeaklyColored() ? Color.GRAY : Color.LIGHT_GRAY); - if(mouseOver) { - brush.drawRect(1,1,getWidth() - 2, getHeight() - 2); - } +// if(mouseOver) { +// brush.drawRect(1,1,getWidth() - 2, getHeight() - 2); +// } brush.setFont(SwingUtils.MEDIUM_MONOSPACE_FONT); int y = SwingUtils.MARGIN; for (String line : lines) {