robertvokac/time-calc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fixed Fuel Gauge icon - should be rendered just after rendering the background

Browse Source
This commit is contained in:
Robert Vokac 2024-03-28 14:37:10 +01:00
parent f02e1d6f7e
commit c549105284
No known key found for this signature in database
GPG Key ID: 693D30BEE3329055
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressFuelGauge.java
View File

@ -93,6 +93,27 @@ public class ProgressFuelGauge extends Widget implements GetProperty {
: Color.LIGHT_GRAY);
brush.setFont(SwingUtils.MEDIUM_MONOSPACE_FONT);
brush.fillRect(1, 1, getWidth(), getHeight());
if (fuelIconVisibleProperty.isEnabled() && visibility == Visibility.STRONGLY_COLORED) {
if(this.orangeIcon == null) {
try {
this.orangeIcon = ImageIO.read(getClass().getResource(
FUEL_GAUGE_FUEL_GAUGE_ICON_ORANGE_PNG));
} catch (IOException e) {
e.printStackTrace();
}
}
if(this.darkGrayIcon == null) {
try {
this.darkGrayIcon = ImageIO.read(getClass().getResource(
FUEL_GAUGE_FUEL_GAUGE_ICON_DARK_GRAY_PNG));
} catch (IOException e) {
e.printStackTrace();
}
}
brush.drawImage(donePercent() <= 0.15d ? this.orangeIcon : this.darkGrayIcon, getWidth() - 32, getHeight() - 48, 32, 32, null);
}
brush.setColor(visibility.isStronglyColored() ? BLACK2
: visibility.isWeaklyColored() ? Color.LIGHT_GRAY
: LIGHT_GRAY2);
@ -176,27 +197,6 @@ public class ProgressFuelGauge extends Widget implements GetProperty {
);
brush.setColor(Color.WHITE);
if (fuelIconVisibleProperty.isEnabled()) {
if(this.orangeIcon == null) {
try {
this.orangeIcon = ImageIO.read(getClass().getResource(
FUEL_GAUGE_FUEL_GAUGE_ICON_ORANGE_PNG));
} catch (IOException e) {
e.printStackTrace();
}
}
if(this.darkGrayIcon == null) {
try {
this.darkGrayIcon = ImageIO.read(getClass().getResource(
FUEL_GAUGE_FUEL_GAUGE_ICON_DARK_GRAY_PNG));
} catch (IOException e) {
e.printStackTrace();
}
}
brush.drawImage(donePercent() <= 0.15d ? this.orangeIcon : this.darkGrayIcon, getWidth() - 32, getHeight() - 48, 32, 32, null);
}
//tBrush.drawBorder(startX, startY, 10, length_ - 4 - 5, getAngle.apply(donePercent()), 3f, brush.getColor());
this.setToolTipText(NumberFormats.FORMATTER_TWO_DECIMAL_PLACES.format(donePercent() * 100d) + "%");
}