Bugfix: GUI/Options: Set prevwidget correctly in FixTabOrder

luke-jr · luke-jr · commit 50feba09b815 · 2025-03-05T23:30:17.000Z
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
@@ -89,11 +89,11 @@ void OptionsDialog::FixTabOrder(QWidget * const o)
 {
     BitcoinAmountField * const af = qobject_cast<BitcoinAmountField *>(o);
     if (af) {
-        af->setupTabChain(prevwidget);
+        prevwidget = af->setupTabChain(prevwidget);
     } else {
         setTabOrder(prevwidget, o);
+        prevwidget = o;
     }
-    prevwidget = o;
 }
 
 void OptionsDialog::CreateOptionUI(QBoxLayout * const layout, QWidget * const o, const QString& text, QBoxLayout *horizontalLayout)

Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,11 @@ void OptionsDialog::FixTabOrder(QWidget * const o)`
`89`	`89`	`{`
`90`	`90`	`BitcoinAmountField * const af = qobject_cast<BitcoinAmountField *>(o);`
`91`	`91`	`if (af) {`
`92`		`- af->setupTabChain(prevwidget);`
	`92`	`+ prevwidget = af->setupTabChain(prevwidget);`
`93`	`93`	`} else {`
`94`	`94`	`setTabOrder(prevwidget, o);`
	`95`	`+ prevwidget = o;`
`95`	`96`	`}`
`96`		`- prevwidget = o;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`void OptionsDialog::CreateOptionUI(QBoxLayout * const layout, QWidget * const o, const QString& text, QBoxLayout *horizontalLayout)`