assign escbtn and defbtn appropriately

Behaviorally: This change makes it so that Enter will never cancel
a dialog, unless that dialog only contains info to be read. Escape
will never unpredictably be treated as Enter. And some dialogs without
Escape to cancel, now can be canceled with Escape.

A lot of this just refactors dialogs to define the cancel button
at the top, not as a hotkey on a cancel button deep in the XML.
I think this makes enter/escape behavior in dialogxml files more
legible at a glance.
This commit is contained in:
2025-03-27 13:34:44 -05:00
parent 8af5eb6c38
commit 500471bad1
157 changed files with 246 additions and 246 deletions

View File

@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
<dialog defbtn='cancel'>
<dialog escbtn='cancel'>
<pict type='dlog' num='10' top='6' left='6'/>
<text top='6' left='48' width='192' height='40'>
This creature isn't hostile.<br/>
Attack anyway?
</text>
<button name='cancel' type='regular' def-key='esc' top='53' left='114'>Cancel</button>
<button name='cancel' type='regular' top='53' left='114'>Cancel</button>
<button name='attack' type='regular' top='53' left='182'>Attack</button>
</dialog>