openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

assign escbtn and defbtn appropriately

Browse Source 
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:
Nat Quayle Nelson
2025-03-27 13:34:44 -05:00
parent 1b65be5ab4
commit 3e3b2e1e6f
95 changed files with 184 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rsrc/dialogs/edit-outdoor-encounter.xml
View File

@@ -1,7 +1,7 @@
<?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='okay'>
<dialog defbtn='okay' escbtn='cancel'>
<!-- OK button -->
<field name='onmeet' top='189' left='361' width='46' height='16'/>
<field name='onwin' top='231' left='361' width='46' height='16'/>
@@ -19,7 +19,7 @@
<text name='ally2' framed='true' top='327' left='129' width='145' height='14'/>
<text name='ally3' framed='true' top='351' left='129' width='145' height='14'/>
<button name='okay' type='regular' top='370' left='489'>OK</button>
<button name='cancel' type='regular' def-key='esc' top='370' left='423'>Cancel</button>
<button name='cancel' type='regular' top='370' left='423'>Cancel</button>
<button name='left' type='left' def-key='left' top='370' left='11'/>
<button name='right' type='right' def-key='right' top='370' left='74'/>
<button name='choose-foe1' type='regular' top='130' left='280'>Choose</button>