Skip to content

Commit 6557613

Browse files
committed
Merge #2070: [GUI] coin-control: remove column checkbox extra white space in tree-mode
fe4f556 GUI: ccontrol: remove column checkbox extra whitespace in tree mode (random-zebra) Pull request description: Addresses the comment in #2033 (review) Always use the minimum width in list-mode. Save the current width when switching from tree-mode to list-mode, and restore it switching back. ACKs for top commit: furszy: ACK fe4f556 Fuzzbawls: ACK fe4f556 Tree-SHA512: cc9d7ab0124fbcc7d9074aca1404b39a6afe26ac422a58a4f91c2f59f6f59b8fd800df4691b2f8ba058862c14a7657102a42df02ab3a16b997fc96236d48fcfb
2 parents 95ed10a + fe4f556 commit 6557613

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/qt/coincontroldialog.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ CoinControlDialog::CoinControlDialog(QWidget* parent, bool _forDelegation) : QDi
165165
// Toggle lock state
166166
connect(ui->pushButtonToggleLock, &QPushButton::clicked, this, &CoinControlDialog::buttonToggleLockClicked);
167167

168-
ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 100);
168+
ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, colCheckBoxWidth_treeMode);
169169
ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 110);
170170
ui->treeWidget->setColumnWidth(COLUMN_LABEL, 160);
171171
ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 310);
@@ -795,6 +795,13 @@ void CoinControlDialog::updateView()
795795
for (int i = 0; i < ui->treeWidget->topLevelItemCount(); i++)
796796
if (ui->treeWidget->topLevelItem(i)->checkState(COLUMN_CHECKBOX) == Qt::PartiallyChecked)
797797
ui->treeWidget->topLevelItem(i)->setExpanded(true);
798+
// restore saved width for COLUMN_CHECKBOX
799+
ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, colCheckBoxWidth_treeMode);
800+
} else {
801+
// save COLUMN_CHECKBOX width for tree-mode
802+
colCheckBoxWidth_treeMode = std::max(110, ui->treeWidget->columnWidth(COLUMN_CHECKBOX));
803+
// minimize COLUMN_CHECKBOX width in list-mode (need to display only the check box)
804+
ui->treeWidget->resizeColumnToContents(COLUMN_CHECKBOX);
798805
}
799806

800807
// sort view

src/qt/coincontroldialog.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class CoinControlDialog : public QDialog
6464
int sortColumn;
6565
Qt::SortOrder sortOrder;
6666
bool forDelegation;
67+
int colCheckBoxWidth_treeMode{110};
6768
// pair (recipient amount, ishielded recipient)
6869
std::vector<std::pair<CAmount, bool>> payAmounts{};
6970
unsigned int nSelectableInputs{0};

0 commit comments

Comments
 (0)