X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fdialog.c;h=ed73be09501a6a81db14751e73d824b5cd1a618e;hb=129ac6d2e1c51e90e97c96085858bc586fb7ec24;hp=800a12681e4eb3d8b95ba4c0206baf1691cf5f3a;hpb=2886ed5676755f4242704d64d3315124026496bb;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/item/dialog.c b/qcsrc/menu/item/dialog.c index 800a12681..ed73be095 100644 --- a/qcsrc/menu/item/dialog.c +++ b/qcsrc/menu/item/dialog.c @@ -124,7 +124,6 @@ void Dialog_TDempty(entity me, float colspan) void Dialog_configureDialog(entity me) { - entity closebutton; float absWidth, absHeight; me.frame = spawnBorderImage(); @@ -152,16 +151,15 @@ void Dialog_configureDialog(entity me) me.fill(me); - if(me.closable) + if(me.closable && me.borderLines > 0) { - closebutton = me.closeButton = spawnButton(); + entity closebutton; + closebutton = me.closeButton = me.frame.closeButton = spawnButton(); closebutton.configureButton(closebutton, "", 0, me.closeButtonImage); closebutton.onClick = Dialog_Close; closebutton.onClickEntity = me; closebutton.srcMulti = 0; me.addItem(me, closebutton, '0 0 0', '1 1 0', 1); // put it as LAST } - - me.frame.closeButton = closebutton; } void Dialog_close(entity me)