From fc480d2c884a6d81c052bb0bfee5c8217e809fb4 Mon Sep 17 00:00:00 2001
From: jamescowens <jamesowens@optonline.net>
Date: Fri, 11 Oct 2019 16:17:57 -0400
Subject: [PATCH] Change default rpcconsole.ui window size

Also change default column widths and peer info widths for
peers tab.
---
 src/qt/forms/rpcconsole.ui |  6 +++---
 src/qt/rpcconsole.cpp      | 11 ++++++++---
 src/qt/rpcconsole.h        | 14 ++++++++------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui
index f303a5f6fd..df857e6a5f 100755
--- a/src/qt/forms/rpcconsole.ui
+++ b/src/qt/forms/rpcconsole.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>784</width>
-    <height>718</height>
+    <width>1000</width>
+    <height>720</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -838,7 +838,7 @@
                 <x>0</x>
                 <y>0</y>
                 <width>300</width>
-                <height>426</height>
+                <height>583</height>
                </rect>
               </property>
               <property name="minimumSize">
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index c02c0ca1af..d7b321046b 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -308,9 +308,14 @@ void RPCConsole::setClientModel(ClientModel *model)
         ui->peerWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
         ui->peerWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
         ui->peerWidget->setContextMenuPolicy(Qt::CustomContextMenu);
-        ui->peerWidget->setColumnWidth(PeerTableModel::Address, ADDRESS_COLUMN_WIDTH);
-        ui->peerWidget->setColumnWidth(PeerTableModel::Subversion, SUBVERSION_COLUMN_WIDTH);
-        ui->peerWidget->setColumnWidth(PeerTableModel::Ping, PING_COLUMN_WIDTH);
+
+        // Scale column widths by the logical DPI over 96.0 to deal with hires displays.
+        ui->peerWidget->setColumnWidth(PeerTableModel::NetNodeId, NETNODEID_COLUMN_WIDTH * logicalDpiX() / 96);
+        ui->peerWidget->setColumnWidth(PeerTableModel::Address, ADDRESS_COLUMN_WIDTH * logicalDpiX() / 96);
+        ui->peerWidget->setColumnWidth(PeerTableModel::Ping, PING_COLUMN_WIDTH * logicalDpiX() / 96);
+        ui->peerWidget->setColumnWidth(PeerTableModel::Sent, SENT_COLUMN_WIDTH * logicalDpiX() / 96);
+        ui->peerWidget->setColumnWidth(PeerTableModel::Received, RECEIVED_COLUMN_WIDTH * logicalDpiX() / 96);
+        ui->peerWidget->setColumnWidth(PeerTableModel::Subversion, SUBVERSION_COLUMN_WIDTH * logicalDpiX() / 96);
         ui->peerWidget->horizontalHeader()->setStretchLastSection(true);
 
         // create peer table context menu actions
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 42421589ac..660f85c8df 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -116,12 +116,14 @@ public slots:
 
     enum ColumnWidths
     {
-        ADDRESS_COLUMN_WIDTH = 200,
-        SUBVERSION_COLUMN_WIDTH = 150,
-        PING_COLUMN_WIDTH = 80,
-        BANSUBNET_COLUMN_WIDTH = 200,
-        BANTIME_COLUMN_WIDTH = 250
-
+        NETNODEID_COLUMN_WIDTH = 50,
+        ADDRESS_COLUMN_WIDTH = 130,
+        PING_COLUMN_WIDTH = 50,
+        SENT_COLUMN_WIDTH = 50,
+        RECEIVED_COLUMN_WIDTH = 60,
+        SUBVERSION_COLUMN_WIDTH = 130,
+        BANSUBNET_COLUMN_WIDTH = 130,
+        BANTIME_COLUMN_WIDTH = 130
     };
 
 };