Merge 55b1ffc into merged_master (Bitcoin PR bitcoin-core/gui#116)

apoelstra · Dec 1, 2020 · d930257 · d930257
2 parents e8fef3b + 55b1ffc
commit d930257
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
@@ -2,12 +2,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <qt/createwalletdialog.h>
-#include <qt/walletcontroller.h>
 #include <qt/walletframe.h>
-#include <qt/walletmodel.h>
 
 #include <qt/bitcoingui.h>
+#include <qt/createwalletdialog.h>
+#include <qt/overviewpage.h>
+#include <qt/walletcontroller.h>
+#include <qt/walletmodel.h>
 #include <qt/walletview.h>
 
 #include <cassert>
@@ -18,10 +19,11 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-WalletFrame::WalletFrame(const PlatformStyle *_platformStyle, BitcoinGUI *_gui) :
-    QFrame(_gui),
-    gui(_gui),
-    platformStyle(_platformStyle)
+WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, BitcoinGUI* _gui)
+    : QFrame(_gui),
+      gui(_gui),
+      platformStyle(_platformStyle),
+      m_size_hint(OverviewPage{platformStyle, nullptr}.sizeHint())
 {
     // Leave HBox hook for adding a list view later
     QHBoxLayout *walletFrameLayout = new QHBoxLayout(this);

diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
@@ -45,6 +45,8 @@ class WalletFrame : public QFrame
 
     void showOutOfSyncWarning(bool fShow);
 
+    QSize sizeHint() const override { return m_size_hint; }
+
 Q_SIGNALS:
     /** Notify that the user has requested more information about the out-of-sync warning */
     void requestedSyncWarningInfo();
@@ -59,6 +61,8 @@ class WalletFrame : public QFrame
 
     const PlatformStyle *platformStyle;
 
+    const QSize m_size_hint;
+
 public:
     WalletView* currentWalletView() const;
     WalletModel* currentWalletModel() const;