Skip to content

Commit 8d7d5f2

Browse files
author
MarcoFalke
committed
Merge #202: peers-tab: bug fix right panel toggle
8353e8c peers-tab: bug fix right panel toggle (randymcmillan) Pull request description: Initial Presentation: ![Screen Shot 2021-01-28 at 8 36 15 PM](https://user-images.githubusercontent.com/152159/106220159-e2a81b80-61a8-11eb-84e9-f9b44375c9a1.png) When node row selected - panel is presented: ![Screen Shot 2021-01-28 at 8 36 22 PM](https://user-images.githubusercontent.com/152159/106220185-eb98ed00-61a8-11eb-9467-6a762941902d.png) When network disabled - right panel is hidden: ![Screen Shot 2021-01-28 at 8 36 32 PM](https://user-images.githubusercontent.com/152159/106220235-0a977f00-61a9-11eb-8a10-f31e4312ed31.png) ACKs for top commit: jarolrod: ACK 8353e8c jonatack: ACK 8353e8c tested rebased on current master. Behavior is initially a bit surprising but this would allow more columns to be added to the peers tab window. Verified that selecting more than one peer, clicking on a column header, or running `disconnectnode "" <currently-selected-peer-id>` in the console (or on the CLI with the `-server` startup option) returns the window to its full size. If this is merged, it might be nice to have an obvious way to close the details area like a clickable "close this" icon in the upper left corner of the area. Talkless: tACK 8353e8c, tested on Debian Sid. Made `bitcoind` connect to `bitcoin-qt` with the PR changes, and after I quit the `bitcoind` instance, right panel do disappear, compared to the previous commit where it didn't. Tree-SHA512: 8fc156f40bdd61e3ba8db333c729a2a07fd5f0fd1eed56f2fd2aa5ae5864756f8ab6fad74ae2fb0552ee7518b6d489f5800709e6c80c6f31f61fd8ce21cece5f
2 parents 02fda82 + 8353e8c commit 8d7d5f2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/qt/forms/debugwindow.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@
988988
</item>
989989
</layout>
990990
</widget>
991-
<widget class="QWidget" name="widget_2" native="true">
991+
<widget class="QWidget" name="peersTabRightPanel" native="true">
992992
<property name="sizePolicy">
993993
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
994994
<horstretch>0</horstretch>

src/qt/rpcconsole.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,7 @@ void RPCConsole::updateDetailWidget()
10971097
{
10981098
const QList<QModelIndex> selected_peers = GUIUtil::getEntryData(ui->peerWidget, PeerTableModel::NetNodeId);
10991099
if (!clientModel || !clientModel->getPeerTableModel() || selected_peers.size() != 1) {
1100-
ui->detailWidget->hide();
1100+
ui->peersTabRightPanel->hide();
11011101
ui->peerHeading->setText(tr("Select a peer to view detailed information."));
11021102
return;
11031103
}
@@ -1151,7 +1151,7 @@ void RPCConsole::updateDetailWidget()
11511151
ui->peerPingWait->setText(GUIUtil::formatPingTime(stats->nodeStateStats.m_ping_wait_usec));
11521152
}
11531153

1154-
ui->detailWidget->show();
1154+
ui->peersTabRightPanel->show();
11551155
}
11561156

11571157
void RPCConsole::resizeEvent(QResizeEvent *event)

0 commit comments

Comments
 (0)