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

Fix call_focus_handlers arg behavior. Fix #768

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-06-26 16:55:31 -07:00
committed by Celtic Minstrel
parent 50793aa79e
commit 95e0cfc1c5
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/dialogxml/widgets/stack.cpp
View File

@@ -64,21 +64,20 @@ bool cStack::setPage(size_t n, bool call_focus_handlers) {
if(n == curPage) return true;
cTextField* focus = getDialog()->getFocus();
bool failed = false;
if(call_focus_handlers){
for(auto p : controls) {
const std::string& id = p.first;
cControl& ctrl = *p.second;
// Only trigger focus handlers if the current page still exists.
if(curPage < nPages) {
storage[curPage][id] = ctrl.store();
if(!ctrl.triggerFocusHandler(*getDialog(), id, true))
for(auto p : controls) {
const std::string& id = p.first;
cControl& ctrl = *p.second;
// Only trigger focus handlers if the current page still exists.
if(curPage < nPages) {
storage[curPage][id] = ctrl.store();
if(call_focus_handlers && !ctrl.triggerFocusHandler(*getDialog(), id, true))
failed = true;
if(!failed) {
ctrl.restore(storage[n][id]);
if(focus == &ctrl && !ctrl.triggerFocusHandler(*getDialog(), id, false)) {
failed = true;
if(!failed) {
ctrl.restore(storage[n][id]);
if(focus == &ctrl && !ctrl.triggerFocusHandler(*getDialog(), id, false)) {
failed = true;
ctrl.restore(storage[curPage][id]);
}
ctrl.restore(storage[curPage][id]);
}
}
}