X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fborderimage.c;h=1fdec60ef7f8ca9b100d0cd75a4a988e03530abe;hb=0c6fc307c63947463f12d20b1774b714b54d846f;hp=0229b53a55b9d6e18a72ba6e97bdd313d92d5193;hpb=1d02a7ca9ba75edf897d843e7dfb5635ad7dd23f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/borderimage.c b/qcsrc/menu/item/borderimage.c
index 0229b53a5..1fdec60ef 100644
--- a/qcsrc/menu/item/borderimage.c
+++ b/qcsrc/menu/item/borderimage.c
@@ -13,7 +13,6 @@ CLASS(BorderImage) EXTENDS(Label)
 	ATTRIB(BorderImage, isNexposeeTitleBar, float, 0)
 	ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0)
 	ATTRIB(BorderImage, zoomedOutTitleBar, float, 0)
-	ATTRIB(BorderImage, borderLines, float, 1)
 ENDCLASS(BorderImage)
 #endif
 
@@ -36,13 +35,14 @@ void BorderImage_resizeNotify(entity me, vector relOrigin, vector relSize, vecto
 		me.realFontSize_Nexposeed = me.realFontSize;
 	}
 	SUPER(BorderImage).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
-	me.borderVec = me.borderHeight / absSize_y * (eY + eX * (absSize_y / absSize_x));
+	me.borderVec_x = me.borderHeight / absSize_x;
+	me.borderVec_y = me.borderHeight / absSize_y;
 	me.realOrigin_y = 0.5 * (me.borderVec_y - me.realFontSize_y);
 	if(me.closeButton)
 	{
 		// move the close button to the right place
 		me.closeButton.Container_origin = '1 0 0' * (1 - me.borderVec_x);
-		me.closeButton.Container_size = me.borderVec;
+		me.closeButton.Container_size = (me.borderHeight > 0) ? me.borderVec : 0.0001 * '1 1 0'; //workaround to not draw a big closebutton if borderHeight is 0
 		me.closeButton.color = me.color;
 		me.closeButton.colorC = me.color;
 		me.closeButton.colorF = me.color;
@@ -60,7 +60,7 @@ void BorderImage_draw(entity me)
 	//print(vtos(me.borderVec), "\n");
 
 	if(me.src)
-		draw_BorderPicture('0 0 0', me.src, '1 1 0', me.color, 1, me.borderLines * me.borderVec);
+		draw_BorderPicture('0 0 0', me.src, '1 1 0', me.color, 1, me.borderVec);
 	if(me.fontSize > 0)
 	{
 		vector ro, rf, df;