Merge pull request #3480

340bff3 ui: Better tab order in send coins entry (Wladimir J. van der Laan)

src/qt/sendcoinsentry.cpp

@@ -155,11 +155,12 @@ SendCoinsRecipient SendCoinsEntry::getValue()
 QWidget *SendCoinsEntry::setupTabChain(QWidget *prev)
 {
     QWidget::setTabOrder(prev, ui->payTo);
-    QWidget::setTabOrder(ui->payTo, ui->addressBookButton);
+    QWidget::setTabOrder(ui->payTo, ui->addAsLabel);
+    QWidget *w = ui->payAmount->setupTabChain(ui->addAsLabel);
+    QWidget::setTabOrder(w, ui->addressBookButton);
     QWidget::setTabOrder(ui->addressBookButton, ui->pasteButton);
     QWidget::setTabOrder(ui->pasteButton, ui->deleteButton);
-    QWidget::setTabOrder(ui->deleteButton, ui->addAsLabel);
+    return ui->deleteButton;
-    return ui->payAmount->setupTabChain(ui->addAsLabel);
 }
 
 void SendCoinsEntry::setValue(const SendCoinsRecipient &value)