Merge branch 'terencehill/menu_remove_tab_title' of git://de.git.xonotic.org/xonotic...

Conflicts:
	qcsrc/menu/item/dialog.qc

diff --cc qcsrc/menu/item/dialog.qc
index 2f64c4e9194397c473423d7c3aa01eededed55b4,b6048ac682219d7958cf2f3699e599ba634b0c13..77037ace61132e48fc3bf57e87f24fc7e249756a
--- 1/qcsrc/menu/item/dialog.qc
--- 2/qcsrc/menu/item/dialog.qc
+++ b/qcsrc/menu/item/dialog.qc
@@@ -128,15 -130,12 +130,15 @@@ void Dialog_configureDialog(entity me
  {
        float absWidth, absHeight;
  
 -      me.frame = NEW(BorderImage);
 -      me.frame.configureBorderImage(me.frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.borderLines * me.titleHeight);
 -      me.frame.zoomedOutTitleBarPosition = me.zoomedOutTitleBarPosition;
 -      me.frame.zoomedOutTitleBar = me.zoomedOutTitleBar;
 -      me.frame.alpha = me.alpha;
 -      me.addItem(me, me.frame, '0 0 0', '1 1 0', 1);
 +      if(me.isTabRoot)
 +      {
-               me.frame = spawnBorderImage();
++              me.frame = NEW(BorderImage);
 +              me.frame.configureBorderImage(me.frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.borderLines * me.titleHeight);
 +              me.frame.zoomedOutTitleBarPosition = me.zoomedOutTitleBarPosition;
 +              me.frame.zoomedOutTitleBar = me.zoomedOutTitleBar;
 +              me.frame.alpha = me.alpha;
 +              me.addItem(me, me.frame, '0 0 0', '1 1 0', 1);
 +      }
  
        if (!me.titleFontSize)
                me.titleHeight = 0; // no title bar
@@@ -156,10 -155,10 +158,10 @@@
  
        me.fill(me);
  
 -      if(me.closable && me.borderLines > 0)
 +      if(me.isTabRoot && me.closable && me.borderLines > 0)
        {
                entity closebutton;
-               closebutton = me.closeButton = me.frame.closeButton = spawnButton();
+               closebutton = me.closeButton = me.frame.closeButton = NEW(Button);
                closebutton.configureButton(closebutton, "", 0, me.closeButtonImage);
                closebutton.onClick = Dialog_Close; closebutton.onClickEntity = me;
                closebutton.srcMulti = 0;

diff --cc qcsrc/menu/item/tab.qc
Simple merge