diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index c2f80ac60c..570fadad98 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -7,7 +7,7 @@
0
0
596
- 342
+ 781
@@ -17,7 +17,7 @@
-
- false
+ true
QLabel { background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000; }
@@ -34,7 +34,7 @@
-
-
+
-
-
@@ -110,437 +110,520 @@
-
-
-
- 12
+
+
+
+ 0
+ 0
+
-
-
-
-
-
- 75
- true
-
-
-
- IBeamCursor
-
-
- Unconfirmed transactions to watch-only addresses
-
-
- 0.000 000 00 BTC
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- IBeamCursor
-
-
- Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance
-
-
- 0.000 000 00 BTC
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- IBeamCursor
-
-
- Mined balance in watch-only addresses that has not yet matured
-
-
- 0.000 000 00 BTC
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 140
- 0
-
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- Total:
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- IBeamCursor
-
-
- Mined balance that has not yet matured
-
-
- 0.000 000 00 BTC
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Immature:
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- IBeamCursor
-
-
- Your current total balance
-
-
- 0.000 000 00 BTC
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- IBeamCursor
-
-
- Current total balance in watch-only addresses
-
-
- 0.000 000 00 BTC
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- -
-
-
- Watch-only:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Available:
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- IBeamCursor
-
-
- Your current spendable balance
-
-
- 0.000 000 00 BTC
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- IBeamCursor
-
-
- Your current balance in watch-only addresses
-
-
- 0.000 000 00 BTC
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
-
-
-
- -
-
-
- Pending:
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
-
- Spendable:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
+
+
+ 500
+ 300
+
+
+
+
+ 1
+ 1
+
+
+
+ Qt::ScrollBarAsNeeded
+
+
+ Qt::ScrollBarAsNeeded
+
+
+ QAbstractScrollArea::AdjustToContents
+
+
+ true
+
+
+
+
+ 0
+ 0
+ 560
+ 296
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 500
+ 200
+
+
+
+
+
+ 0
+ 0
+ 551
+ 253
+
+
+
+
+ QLayout::SetMinimumSize
+
+
+ 12
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Spendable:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ IBeamCursor
+
+
+ Your current balance in watch-only addresses
+
+
+ 0.000 000 00 BTC
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Immature:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Total:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Available:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ IBeamCursor
+
+
+ Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance
+
+
+ 0.000 000 00 BTC
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+ Watch-only:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ IBeamCursor
+
+
+ Mined balance that has not yet matured
+
+
+ 0.000 000 00 BTC
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+ Pending:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 140
+ 0
+
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ IBeamCursor
+
+
+ Current total balance in watch-only addresses
+
+
+ 0.000 000 00 BTC
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ IBeamCursor
+
+
+ Your current total balance
+
+
+ 0.000 000 00 BTC
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ IBeamCursor
+
+
+ Unconfirmed transactions to watch-only addresses
+
+
+ 0.000 000 00 BTC
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ IBeamCursor
+
+
+ Mined balance in watch-only addresses that has not yet matured
+
+
+ 0.000 000 00 BTC
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ IBeamCursor
+
+
+ Your current spendable balance
+
+
+ 0.000 000 00 BTC
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+
-
-
+
+
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
- -
-
-
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
-
+
+
-
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
-
-
-
-
- 75
- true
-
-
-
- Recent transactions
-
-
+
+
-
+
+
+
+ 75
+ true
+
+
+
+ Recent transactions
+
+
+
+ -
+
+
+ true
+
+
+
+ 30
+ 16777215
+
+
+
+ The displayed information may be out of date. Your wallet automatically synchronizes with the Liquid network after a connection is established, but this process has not completed yet.
+
+
+
+
+
+
+ :/icons/warning
+ :/icons/warning:/icons/warning
+
+
+
+ 24
+ 24
+
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
-
-
-
- true
+
+
+ QListView { background: transparent; }
-
-
- 30
- 16777215
-
-
-
- The displayed information may be out of date. Your wallet automatically synchronizes with the Liquid network after a connection is established, but this process has not completed yet.
+
+ QFrame::NoFrame
-
-
+
+ Qt::ScrollBarAlwaysOff
-
-
- :/icons/warning
- :/icons/warning:/icons/warning
+
+ Qt::ScrollBarAlwaysOff
-
-
- 24
- 24
-
-
-
- true
+
+ QAbstractItemView::NoSelection
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
- -
-
-
- QListView { background: transparent; }
-
-
- QFrame::NoFrame
-
-
- Qt::ScrollBarAlwaysOff
-
-
- Qt::ScrollBarAlwaysOff
-
-
- QAbstractItemView::NoSelection
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
+
+
+
@@ -548,6 +631,8 @@
-
+
+
+
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index d20f30dc3e..f77ba8bee3 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -119,11 +119,6 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
m_balances.balance[::policyAsset] = -1;
- // Move the "Recent Transactions" view below "Balances"
- ui->verticalLayout_3->removeWidget(ui->frame_2);
- ui->verticalLayout_2->addWidget(ui->frame_2);
- ui->horizontalLayout->removeItem(ui->verticalLayout_3);
-
// use a SingleColorIcon for the "out of sync warning" icon
QIcon icon = platformStyle->SingleColorIcon(":/icons/warning");
icon.addPixmap(icon.pixmap(QSize(64,64), QIcon::Normal), QIcon::Disabled); // also set the disabled icon because we are using a disabled QPushButton to work around missing HiDPI support of QLabel (https://bugreports.qt.io/browse/QTBUG-42503)
@@ -189,6 +184,10 @@ void OverviewPage::setBalance(const interfaces::WalletBalances& balances)
ui->labelImmature->setVisible(showImmature || showWatchOnlyImmature);
ui->labelImmatureText->setVisible(showImmature || showWatchOnlyImmature);
ui->labelWatchImmature->setVisible(!walletModel->privateKeysDisabled() && showWatchOnlyImmature); // show watch-only immature balance
+
+ // Resize the QScrollArea content widget
+ QSize grid_size = ui->gridLayout->sizeHint();
+ ui->scrollAreaWidgetContents->setMinimumSize(grid_size);
}
// show/hide watch-only labels