Fix history deletion bug after font change

The history is no longer cleared after the font size is changed
This commit is contained in:
Andrew C 2016-03-11 11:57:10 -05:00
parent 0fa88ef784
commit 21e45a097e
2 changed files with 8 additions and 5 deletions

View file

@ -490,16 +490,19 @@ void RPCConsole::setFontSize(int newSize)
// clear console (reset icon sizes, default stylesheet) and re-add the content // clear console (reset icon sizes, default stylesheet) and re-add the content
float oldPosFactor = 1.0 / ui->messagesWidget->verticalScrollBar()->maximum() * ui->messagesWidget->verticalScrollBar()->value(); float oldPosFactor = 1.0 / ui->messagesWidget->verticalScrollBar()->maximum() * ui->messagesWidget->verticalScrollBar()->value();
clear(); clear(false);
ui->messagesWidget->setHtml(str); ui->messagesWidget->setHtml(str);
ui->messagesWidget->verticalScrollBar()->setValue(oldPosFactor * ui->messagesWidget->verticalScrollBar()->maximum()); ui->messagesWidget->verticalScrollBar()->setValue(oldPosFactor * ui->messagesWidget->verticalScrollBar()->maximum());
} }
void RPCConsole::clear() void RPCConsole::clear(bool clearHistory)
{ {
ui->messagesWidget->clear(); ui->messagesWidget->clear();
history.clear(); if(clearHistory)
historyPtr = 0; {
history.clear();
historyPtr = 0;
}
ui->lineEdit->clear(); ui->lineEdit->clear();
ui->lineEdit->setFocus(); ui->lineEdit->setFocus();

View file

@ -77,7 +77,7 @@ private Q_SLOTS:
void clearSelectedNode(); void clearSelectedNode();
public Q_SLOTS: public Q_SLOTS:
void clear(); void clear(bool clearHistory = true);
void fontBigger(); void fontBigger();
void fontSmaller(); void fontSmaller();
void setFontSize(int newSize); void setFontSize(int newSize);