Merge branch 'main' into develop

GoldenGnu · Oct 6, 2024 · cd6ff14 · cd6ff14
2 parents c3455b3 + 105a5ea
commit cd6ff14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedSeparatorTableCell.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedSeparatorTableCell.java
@@ -183,7 +183,9 @@ protected void configure(Separator<?> separator) {
 			jBatchSize.setVisible(false);
 		}
 		//Color
-		if (material.getTotal().isSell()) {
+		if (material.isGrandTotal()) {
+			ColorSettings.config(jColor, ColorEntry.REPROCESSED_EQUAL);
+		} else if (material.getTotal().isSell()) {
 			ColorSettings.config(jColor, ColorEntry.REPROCESSED_SELL);
 		} else if (material.getTotal().isReprocess()) {
 			ColorSettings.config(jColor, ColorEntry.REPROCESSED_REPROCESS);

diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedTotal.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedTotal.java
@@ -105,7 +105,7 @@ public String getTypeName() {
 	}
 
 	public double getValue() {
-		return getSellPrice() * getPortionSize();
+		return getSellPrice() * count;
 	}
 
 	public boolean isSell() {