From: terencehill Date: Sun, 10 May 2015 23:09:24 +0000 (+0200) Subject: Merge branch 'terencehill/menu_remove_tab_title' of git://de.git.xonotic.org/xonotic... X-Git-Tag: xonotic-v0.8.1~54^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbb96108e5828a7557694db4469c2d0d7c582846;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'terencehill/menu_remove_tab_title' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into terencehill/menu_remove_tab_title Conflicts: qcsrc/menu/item/dialog.qc --- fbb96108e5828a7557694db4469c2d0d7c582846 diff --cc qcsrc/menu/item/dialog.qc index 2f64c4e91,b6048ac68..77037ace6 --- a/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;