main bg color was incorrect when block is mostly complete

BiglySoftware · Nov 4, 2023 · 522ac89 · 522ac89
1 parent 2a28629
commit 522ac89
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/uis/src/com/biglybt/ui/swt/views/piece/PieceMapView.java b/uis/src/com/biglybt/ui/swt/views/piece/PieceMapView.java
@@ -1227,6 +1227,7 @@ else if (iNewWidth <= 0)
 				}
 
 				Color bg;
+				Color bgMain = null;
 				Colors colorsInstance = Colors.getInstance();
 				if ( newInfo.selectedRange ){
 					Color fc = blockColors[BLOCKCOLOR_SHOWFILE ];
@@ -1241,8 +1242,8 @@ else if (iNewWidth <= 0)
 						file_color 			= fc;
 						file_color_faded 	= colorsInstance.getLighterColor( fc, 75 );
 					}
-					
-					bg = file_color_faded;
+
+					bgMain = bg = file_color_faded;
 
 				}	else {
 					bg = canvasBG;
@@ -1282,8 +1283,12 @@ else if (iNewWidth <= 0)
 						gcImg.setBackground(bg);
 
 						gcImg.fillRectangle(iXPos, iYPos, newInfo.haveWidth, BLOCK_FILLSIZE);
+
+						if (newInfo.haveWidth * 2 > BLOCK_FILLSIZE) {
+							bgMain = bg;
+						}
 					}
-	
+
 					bg = newInfo.needed ? blockColors[BLOCKCOLOR_NOHAVE] : canvasBG;
 
 					if (newInfo.availNum >= 0 && newInfo.availNum < maxAvailability) {
@@ -1295,11 +1300,14 @@ else if (iNewWidth <= 0)
 					}
 				}
 
-				Color bgMain = bg;
 				gcImg.setBackground(bg);
 				gcImg.fillRectangle(iXPos + newInfo.haveWidth, iYPos,
 						BLOCK_FILLSIZE - newInfo.haveWidth, BLOCK_FILLSIZE);
 
+				if (bgMain == null) {
+					bgMain = bg;
+				}
+
 				if (newInfo.showDown > 0) {
 					boolean isSmall = newInfo.showDown == SHOW_SMALL;
 					bg = blockColors[isSmall ? BLOCKCOLOR_NEXT : BLOCKCOLOR_TRANSFER];