fix(gui): implement resolution scaling for unit health bar and info icons

Mauller · Mauller · commit 335f413f6104 · 2025-12-12T17:22:24.000Z
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -583,6 +583,15 @@ friend class Drawable;	// for selection/deselection transactions
 	void setDrawRMBScrollAnchor(Bool b) { m_drawRMBScrollAnchor = b; }
 	void setMoveRMBScrollAnchor(Bool b) { m_moveRMBScrollAnchor = b; }
 
+	// UI scaling function methods
+	Real m_unitInfoResolutionScaleFactor;
+	Real m_healthResolutionScaleFactor;
+
+	void calcUnitInfoScaleFactor();
+
+	Real getUnitInfoScaleFactor();
+	Real getUnitHealthbarScaleFactor();
+
 private:
 	virtual Int getIdleWorkerCount( void );
 	virtual Object *findIdleWorker( Object *obj);
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -150,6 +150,7 @@ enum CrushSquishTestType CPP_11(: Int)
 	TEST_CRUSH_OR_SQUISH
 };
 
+const Real defaultHealthBoxHeight = 3.0f;
 
 // ---------------------------------------------------
 /**
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
@@ -2677,22 +2677,19 @@ static Bool computeHealthRegion( const Drawable *draw, IRegion2D& region )
 	if (!obj->getHealthBoxDimensions(healthBoxHeight, healthBoxWidth))
 		return FALSE;
 
-	// scale the health bars according to the zoom
-	Real zoom = TheTacticalView->getZoom();
-	//Real widthScale = 1.3f / zoom;
-	Real widthScale = 1.0f / zoom;
-	//Real heightScale = 0.8f / zoom;
-	Real heightScale = 1.0f;
+	// scale the health bars according to the zoom and resolution
+	Real zoomScale = 1.0f / TheTacticalView->getZoom();
 
-	healthBoxWidth *= widthScale;
-	healthBoxHeight *= heightScale;
+	healthBoxWidth *= zoomScale * TheInGameUI->getUnitInfoScaleFactor();
+	// TheSuperHackers @info For now we are integer scaling the health box height
+	healthBoxHeight *= floorf(TheDisplay->getHeightScale());
 
-	// do this so health bar doesn't get too skinny or fat after scaling
-	//healthBoxHeight = max(3.0f, healthBoxHeight);
-	healthBoxHeight = 3.0f;
+
+	// do this so health bar doesn't get too skinny after scaling
+	healthBoxHeight = max(defaultHealthBoxHeight, healthBoxHeight);
 
 	// figure out the final region for the health box
-	region.lo.x = screenCenter.x - healthBoxWidth * 0.45f;
+	region.lo.x = screenCenter.x - healthBoxWidth * 0.5f;
 	region.lo.y = screenCenter.y - healthBoxHeight * 0.5f;
 	region.hi.x = region.lo.x + healthBoxWidth;
 	region.hi.y = region.lo.y + healthBoxHeight;
@@ -2829,10 +2826,10 @@ void Drawable::drawEmoticon( const IRegion2D *healthBarRegion )
 		if( healthBarRegion && getIconInfo()->m_keepTillFrame[ ICON_EMOTICON ] >= now )
 		{
 			//Draw the emoticon.
-			Int barWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
+			Int barWidth = healthBarRegion->width();
 			//Int barHeight = healthBarRegion.hi.y - healthBarRegion.lo.y;
-			Int frameWidth = getIconInfo()->m_icon[ ICON_EMOTICON ]->getCurrentFrameWidth();
-			Int frameHeight = getIconInfo()->m_icon[ ICON_EMOTICON ]->getCurrentFrameHeight();
+			Int frameWidth = getIconInfo()->m_icon[ ICON_EMOTICON ]->getCurrentFrameWidth() * TheInGameUI->getUnitInfoScaleFactor();
+			Int frameHeight = getIconInfo()->m_icon[ ICON_EMOTICON ]->getCurrentFrameHeight() * TheInGameUI->getUnitInfoScaleFactor();
 
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
@@ -2883,9 +2880,9 @@ void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 	Real scale = 1.0f;
 #endif
 
-	Int boxWidth  = REAL_TO_INT(s_emptyAmmo->getImageWidth() * scale);
-	Int boxHeight = REAL_TO_INT(s_emptyAmmo->getImageHeight() * scale);
-	const Int SPACING = 1;
+	Int boxWidth  = s_emptyAmmo->getImageWidth() * scale * TheInGameUI->getUnitInfoScaleFactor();
+	Int boxHeight = s_emptyAmmo->getImageHeight() * scale * TheInGameUI->getUnitInfoScaleFactor();
+	const Real SPACING = 1.0f * TheInGameUI->getUnitInfoScaleFactor();
 	//Int totalWidth = (boxWidth+SPACING)*numTotal;
 
 	ICoord2D screenCenter;
@@ -2950,9 +2947,9 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
 #else
 	Real scale = 1.0f;
 #endif
-	Int boxWidth  = REAL_TO_INT(s_emptyContainer->getImageWidth() * scale);
-	Int boxHeight = REAL_TO_INT(s_emptyContainer->getImageHeight() * scale);
-	const Int SPACING = 1;
+	Int boxWidth  = s_emptyContainer->getImageWidth() * scale * TheInGameUI->getUnitInfoScaleFactor();
+	Int boxHeight = s_emptyContainer->getImageHeight() * scale * TheInGameUI->getUnitInfoScaleFactor();
+	const Real SPACING = 1.0f * TheInGameUI->getUnitInfoScaleFactor();
 	//Int totalWidth = (boxWidth+SPACING)*numTotal;
 
 	ICoord2D screenCenter;
@@ -3003,8 +3000,8 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 				getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ] = newInstance(Anim2D)( s_animationTemplates[ ICON_BATTLEPLAN_BOMBARD ], TheAnim2DCollection );
 			}
 			//Int barHeight = healthBarRegion.hi.y - healthBarRegion.lo.y;
-			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ]->getCurrentFrameWidth();
-			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ]->getCurrentFrameHeight();
+			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ]->getCurrentFrameWidth() * TheInGameUI->getUnitInfoScaleFactor();
+			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ]->getCurrentFrameHeight() * TheInGameUI->getUnitInfoScaleFactor();
 
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
@@ -3031,8 +3028,8 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 				getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ] = newInstance(Anim2D)( s_animationTemplates[ ICON_BATTLEPLAN_HOLDTHELINE ], TheAnim2DCollection );
 			}
 			// draw the icon
-			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->getCurrentFrameWidth();
-			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->getCurrentFrameHeight();
+			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->getCurrentFrameWidth() * TheInGameUI->getUnitInfoScaleFactor();
+			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->getCurrentFrameHeight() * TheInGameUI->getUnitInfoScaleFactor();
 
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
@@ -3059,8 +3056,8 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 				getIconInfo()->m_icon[ ICON_BATTLEPLAN_SEARCHANDDESTROY ] = newInstance(Anim2D)( s_animationTemplates[ ICON_BATTLEPLAN_SEARCHANDDESTROY ], TheAnim2DCollection );
 			}
 			// draw the icon
-			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_SEARCHANDDESTROY ]->getCurrentFrameWidth();
-			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_SEARCHANDDESTROY ]->getCurrentFrameHeight();
+			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_SEARCHANDDESTROY ]->getCurrentFrameWidth() * TheInGameUI->getUnitInfoScaleFactor();
+			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_SEARCHANDDESTROY ]->getCurrentFrameHeight() * TheInGameUI->getUnitInfoScaleFactor();
 
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
@@ -3271,10 +3268,10 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 				// we are going to draw the healing icon relative to the size of the health bar region
 				// since that region takes into account hit point size and zoom factor of the camera too
 				//
-				Int barWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
+				Int barWidth = healthBarRegion->width();
 
-				Int frameWidth = getIconInfo()->m_icon[ typeIndex ]->getCurrentFrameWidth();
-				Int frameHeight = getIconInfo()->m_icon[ typeIndex ]->getCurrentFrameHeight();
+				Int frameWidth = getIconInfo()->m_icon[ typeIndex ]->getCurrentFrameWidth() * TheInGameUI->getUnitInfoScaleFactor();
+				Int frameHeight = getIconInfo()->m_icon[ typeIndex ]->getCurrentFrameHeight() * TheInGameUI->getUnitInfoScaleFactor();
 
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 				// adjust the width to be a % of the health bar region size
@@ -3334,7 +3331,7 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 			// we are going to draw the healing icon relative to the size of the health bar region
 			// since that region takes into account hit point size and zoom factor of the camera too
 			//
-			Int barWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;// used for position
+			Int barWidth = healthBarRegion->width();// used for position
 
 			// based on our own kind of we have certain icons to display at a size scale
 			Real scale;
@@ -3345,8 +3342,8 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 			else
 				scale = 0.5f;
 
-			Int frameWidth = getIconInfo()->m_icon[ iconIndex ]->getCurrentFrameWidth() * scale;
-			Int frameHeight = getIconInfo()->m_icon[ iconIndex ]->getCurrentFrameHeight() * scale;
+			Int frameWidth = getIconInfo()->m_icon[ iconIndex ]->getCurrentFrameWidth() * scale * TheInGameUI->getUnitInfoScaleFactor();
+			Int frameHeight = getIconInfo()->m_icon[ iconIndex ]->getCurrentFrameHeight() * scale * TheInGameUI->getUnitInfoScaleFactor();
 
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
@@ -3635,10 +3632,10 @@ void Drawable::drawDisabled(const IRegion2D* healthBarRegion)
 		// draw the icon
 		if( healthBarRegion )
 		{
-			Int barHeight = healthBarRegion->hi.y - healthBarRegion->lo.y;
+			Int barHeight = healthBarRegion->height();
 
-			Int frameWidth = getIconInfo()->m_icon[ ICON_DISABLED ]->getCurrentFrameWidth();
-			Int frameHeight = getIconInfo()->m_icon[ ICON_DISABLED ]->getCurrentFrameHeight();
+			Int frameWidth = getIconInfo()->m_icon[ ICON_DISABLED ]->getCurrentFrameWidth() * TheInGameUI->getUnitInfoScaleFactor();
+			Int frameHeight = getIconInfo()->m_icon[ ICON_DISABLED ]->getCurrentFrameHeight() * TheInGameUI->getUnitInfoScaleFactor();
 
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
@@ -3784,19 +3781,19 @@ void Drawable::drawVeterancy( const IRegion2D *healthBarRegion )
 	if (!image)
 		return;
 
-	Real scale = 1.3f/CLAMP_ICON_ZOOM_FACTOR( TheTacticalView->getZoom() );
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
+	Real scale = 1.3f/CLAMP_ICON_ZOOM_FACTOR( TheTacticalView->getZoom() );
 	Real objScale = scale * 1.55f;
 #else
 	Real objScale = 1.0f;
 #endif
 
 
-	Real vetBoxWidth  = image->getImageWidth()*objScale;
-	Real vetBoxHeight = image->getImageHeight()*objScale;
+	Real vetBoxWidth  = image->getImageWidth() * objScale * TheInGameUI->getUnitInfoScaleFactor();
+	Real vetBoxHeight = image->getImageHeight() * objScale * TheInGameUI->getUnitInfoScaleFactor();
 
 	//
-	// take the center position of the object, go down to it's bottom extent, and project
+	// take the center position of the health region, go down to it's bottom extent, and project
 	// that point to the screen, that will be the "center" of our veterancy box
 	//
 
@@ -3806,11 +3803,7 @@ void Drawable::drawVeterancy( const IRegion2D *healthBarRegion )
 	if( !TheTacticalView->worldToScreen( &p, &screenCenter ) )
 		return;
 
-	Real healthBoxWidth, healthBoxHeight;
-	if (!obj->getHealthBoxDimensions(healthBoxHeight, healthBoxWidth))
-		return;
-
-	screenCenter.x += healthBoxWidth * scale * 0.5f;
+	screenCenter.x += healthBarRegion->width() * 0.65f;
 
 	// draw the image
 	TheDisplay->drawImage(image, screenCenter.x + 1, screenCenter.y + 1, screenCenter.x + 1 + vetBoxWidth, screenCenter.y + 1 + vetBoxHeight);
@@ -3918,23 +3911,24 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 
 		}
 
+		Real healthBoxWidth = healthBarRegion->width();
+		Real healthBoxHeight = max((Int)defaultHealthBoxHeight, healthBarRegion->height());
+		// TheSuperHackers @info For now we are integer scaling the health box height so we do the same for the health box outline
+		Real healthBoxOutlineSize = floorf( (healthBarRegion->height() / (Int)defaultHealthBoxHeight) );
 
-
-
-///		Real scale = 1.3f / TheTacticalView->getZoom();
-		Real healthBoxWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
-
-		Real healthBoxHeight = max(3, healthBarRegion->hi.y - healthBarRegion->lo.y);
-		Real healthBoxOutlineSize = 1.0f;
+		// draw a filled bar for the health
+		// TheSuperHackers @info this takes up the whole size of the health rect area, the border is drawn over the top
+		// This simplifies the handling of the health bar
+		TheDisplay->drawFillRect( healthBarRegion->lo.x, healthBarRegion->lo.y,
+															healthBoxWidth * healthRatio, healthBoxHeight,
+															color );
 
 		// draw the health box outline
-		TheDisplay->drawOpenRect( healthBarRegion->lo.x, healthBarRegion->lo.y, healthBoxWidth, healthBoxHeight,
+		// TheSuperHackers @info when drawing the outline, the underlying function grows the outline towards the center of the region
+		TheDisplay->drawOpenRect( healthBarRegion->lo.x, healthBarRegion->lo.y,
+															healthBoxWidth, healthBoxHeight,
 															healthBoxOutlineSize, outlineColor );
 
-		// draw a filled bar for the health
-		TheDisplay->drawFillRect( healthBarRegion->lo.x + 1, healthBarRegion->lo.y + 1,
-															(healthBoxWidth - 2) * healthRatio, healthBoxHeight - 2,
-															color );
 	}
 
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
@@ -758,6 +758,8 @@ void DeclineResolution()
 		TheShell->recreateWindowLayouts();
 
 		TheInGameUI->recreateControlBar();
+		TheInGameUI->refreshCustomUiResources();
+		TheInGameUI->calcUnitInfoScaleFactor();
 	}
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -1617,6 +1617,7 @@ static void saveOptions( void )
 
 				TheInGameUI->recreateControlBar();
 				TheInGameUI->refreshCustomUiResources();
+				TheInGameUI->calcUnitInfoScaleFactor();
 			}
 		}
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -1168,6 +1168,9 @@ InGameUI::InGameUI()
 
 	m_soloNexusSelectedDrawableID = INVALID_DRAWABLE_ID;
 
+	m_unitInfoResolutionScaleFactor = 1.0f;
+	m_healthResolutionScaleFactor = 1.0f;
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1301,6 +1304,9 @@ void InGameUI::init( void )
 	setDrawRMBScrollAnchor(TheGlobalData->m_drawScrollAnchor);
 	setMoveRMBScrollAnchor(TheGlobalData->m_moveScrollAnchor);
 
+	// TheSuperHackers @todo implement option to retrieve user based scaling options
+	calcUnitInfoScaleFactor();
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -6168,3 +6174,19 @@ void InGameUI::drawGameTime()
 	m_gameTimeString->draw(horizontalTimerOffset, m_gameTimePosition.y, m_gameTimeColor, m_gameTimeDropColor);
 	m_gameTimeFrameString->draw(horizontalFrameOffset, m_gameTimePosition.y, GameMakeColor(180,180,180,255), m_gameTimeDropColor);
 }
+
+void InGameUI::calcUnitInfoScaleFactor()
+{
+	m_unitInfoResolutionScaleFactor = max(TheDisplay->getWidthScale(), TheDisplay->getHeightScale());
+	m_healthResolutionScaleFactor = max(TheDisplay->getWidthScale(), TheDisplay->getHeightScale());
+}
+
+Real InGameUI::getUnitInfoScaleFactor()
+{
+	return m_unitInfoResolutionScaleFactor;
+}
+
+Real InGameUI::getUnitHealthbarScaleFactor()
+{
+	return m_healthResolutionScaleFactor;
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -3405,15 +3405,15 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 	if( isKindOf( KINDOF_STRUCTURE ) )
 	{
 		//enforce healthBoxHeightMinimum/Maximum
-		healthBoxHeight = min(3.0f, max(5.0f, maxHP/50));
+		healthBoxHeight = min(defaultHealthBoxHeight, max(5.0f, maxHP/50));
 		//enforce healthBoxWidthMinimum/Maximum
 		healthBoxWidth = min(150.0f, max(100.0f, maxHP/10));
 		return true;
 	}
 	else if ( isKindOf(KINDOF_MOB_NEXUS) )
 	{
 		//enforce healthBoxHeightMinimum/Maximum
-		healthBoxHeight = min(3.0f, max(5.0f, maxHP/50));
+		healthBoxHeight = min(defaultHealthBoxHeight, max(5.0f, maxHP/50));
 		//enforce healthBoxWidthMinimum/Maximum
 		healthBoxWidth = min(100.0f, max(66.0f, maxHP/10));
 		return true;
@@ -3427,7 +3427,7 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 	else
 	{
 		//enforce healthBoxHeightMinimum/Maximum
-		healthBoxHeight = min(3.0f, max(5.0f, maxHP/50));
+		healthBoxHeight = min(defaultHealthBoxHeight, max(5.0f, maxHP/50));
 		//enforce healthBoxWidthMinimum/Maximum
 		healthBoxWidth = min(150.0f, max(35.0f, maxHP/10));
 		return true;
@@ -3443,7 +3443,7 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 
 	//just add the major and minor axes
 	Real size = MAX(20.0f, MIN(150.0f, (getGeometryInfo().getMajorRadius() + getGeometryInfo().getMinorRadius())) );
-	healthBoxHeight = 3.0f;
+	healthBoxHeight = defaultHealthBoxHeight;
 	healthBoxWidth = MAX(20.0f, size * 2.0f);
 	return TRUE;
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
@@ -587,15 +587,20 @@ void	Render2DClass::Add_Outline( const RectClass & rect, float width, unsigned l
 
 void	Render2DClass::Add_Outline( const RectClass & rect, float width, const RectClass & uv, unsigned long color )
 {
-	//
-	//	Pretty straight forward, simply add the four side of the rectangle as lines.
-	//
-	/** @todo colin, I had to tweak these to get precise line drawing, as we want
-	the UV bias on, but it just isn't lining up */
-	Add_Line (Vector2 (rect.Left + 1, rect.Bottom),	Vector2 (rect.Left + 1, rect.Top + 1),		width, color);
-	Add_Line (Vector2 (rect.Left, rect.Top + 1),		Vector2 (rect.Right - 1, rect.Top + 1),			width, color);
-	Add_Line (Vector2 (rect.Right, rect.Top),		Vector2 (rect.Right, rect.Bottom - 1),		width, color);
-	Add_Line (Vector2 (rect.Right, rect.Bottom),	Vector2 (rect.Left + 1, rect.Bottom),	width, color);
+	//	Pretty straight forward, add the four side of the rectangle as lines.
+	float lineWidthOffset = (width / 2);
+
+	// TheSuperHackers @bugfix fixed the lines so they overlap eachother in the corners making a full rectangle
+	// Also offset the lines by half of their thickness so the border grows into the center of the rectangle
+
+	// Draw left
+	Add_Line (Vector2 (rect.Left + lineWidthOffset, rect.Bottom), Vector2 (rect.Left + lineWidthOffset, rect.Top), width, color);
+	// Draw top
+	Add_Line (Vector2 (rect.Left, rect.Top + lineWidthOffset), Vector2 (rect.Right, rect.Top + lineWidthOffset), width, color);
+	// Draw right
+	Add_Line (Vector2 (rect.Right - lineWidthOffset, rect.Top), Vector2 (rect.Right - lineWidthOffset, rect.Bottom), width, color);
+	// Draw bottom
+	Add_Line (Vector2 (rect.Right, rect.Bottom - lineWidthOffset), Vector2 (rect.Left, rect.Bottom - lineWidthOffset), width, color);
 }
 
 void Render2DClass::Render(void)

Original file line number	Diff line number	Diff line change
`@@ -758,6 +758,8 @@ void DeclineResolution()`
`758`	`758`	`TheShell->recreateWindowLayouts();`
`759`	`759`
`760`	`760`	`TheInGameUI->recreateControlBar();`
	`761`	`+ TheInGameUI->refreshCustomUiResources();`
	`762`	`+ TheInGameUI->calcUnitInfoScaleFactor();`
`761`	`763`	`}`
`762`	`764`	`}`
`763`	`765`
Original file line number	Diff line number	Diff line change
`@@ -1617,6 +1617,7 @@ static void saveOptions( void )`
`1617`	`1617`
`1618`	`1618`	`TheInGameUI->recreateControlBar();`
`1619`	`1619`	`TheInGameUI->refreshCustomUiResources();`
	`1620`	`+ TheInGameUI->calcUnitInfoScaleFactor();`
`1620`	`1621`	`}`
`1621`	`1622`	`}`
`1622`	`1623`	`}`