diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index bcc2dc422d..aa8534a862 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -59,7 +59,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa headerLayout->addSpacing(23); } - statusSpacer = new QSpacerItem(20, 1, QSizePolicy::Expanding); + statusSpacer = new QSpacerItem(1, 1, QSizePolicy::MinimumExpanding); headerLayout->addSpacerItem(statusSpacer); watchOnlyWidget = new QComboBox(this); @@ -439,14 +439,11 @@ void TransactionView::updateHeaderSizes(int logicalIndex, int oldSize, int newSi if(logicalIndex < TransactionTableModel::ToAddress) return; - headerLayout->blockSignals(true); - statusSpacer->changeSize(transactionView->columnWidth(TransactionTableModel::Status) - 10, 1, QSizePolicy::Expanding); for(std::pair const & p : headerWidgets) { - int const w = transactionView->columnWidth(p.first); + int const w = transactionView->columnWidth(p.first) - headerLayout->spacing() / 2; if(p.second->width() != w) p.second->setFixedWidth(w); } - headerLayout->blockSignals(false); } void TransactionView::abandonTx() @@ -675,7 +672,9 @@ void TransactionView::focusTransaction(const QModelIndex &idx) void TransactionView::resizeEvent(QResizeEvent* event) { QWidget::resizeEvent(event); + disconnect(transactionView->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(updateHeaderSizes(int,int,int))); columnResizingFixer->stretchColumnWidth(TransactionTableModel::ToAddress); + connect(transactionView->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(updateHeaderSizes(int,int,int))); } // Need to override default Ctrl+C action for amount as default behaviour is just to copy DisplayRole text diff --git a/src/validation.cpp b/src/validation.cpp index bab9935dd3..9fc2d7c01b 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2861,8 +2861,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin REJECT_INVALID, "conflict-tx-lock"); } } - } else { - LogPrintf("ConnectBlock(): spork is off, skipping transaction locking checks\n"); } int64_t nTime5_1 = GetTimeMicros(); nTimeISFilter += nTime5_1 - nTime4;