Merge in xonotic/xonotic-data.pk3dir.git: terencehill/big_close_button_fix
git-manager created issue #415 (closed) on 2011-04-17T17:21:12Z:
Purpose of the branch:
Do not spawn the close button on menu dialogs if HEIGHT_DIALOGBORDER is 0 (skin file attribute). Button was shown bigger than normal rather than invisible because drawpic displays an image with its real dimension when given input size is '0 0'
It's still possible to close a dialog by pressing the ESC key.
Menu is now usable even with HEIGHT_DIALOGBORDER 0
Repository: xonotic/xonotic-data.pk3dir.git Commit: 1a508800 Branch: terencehill/big_close_button_fix
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '1a508800c7746487ea72692956139f1061364acf'..'origin/terencehill/big_close_button_fix'
git merge --no-ff 'origin/terencehill/big_close_button_fix'
git push && git push --delete origin 'terencehill/big_close_button_fix'
Diffstat:
qcsrc/menu/item/dialog.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Revision log:
commit 1a508800c7746487ea72692956139f1061364acf
Author: terencehill
Commit: terencehill
Do not spawn the close button on menu dialogs if HEIGHT_DIALOGBORDER is 0 (skin file attribute). Button was shown bigger than normal rather than invisible because drawpic displays an image with its real dimension when given input size is '0 0'
It's still possible to close a dialog by pressing the ESC key.
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/menu/item/dialog.c b/qcsrc/menu/item/dialog.c
index 800a126..da6a401 100644
— a/qcsrc/menu/item/dialog.c
**+ b/qcsrc/menu/item/dialog.c
@ -152,7 +152,7
@ void Dialog_configureDialog
me.fill;
- if
- if(me.closable && me.borderLines > 0) { closebutton = me.closeButton = spawnButton(); closebutton.configureButton(closebutton, “”, 0, me.closeButtonImage);