diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index 6ed9358c0..08d7a5d99 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -327,7 +327,6 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) , _hasTextBlinker(false) , _underlineLinks(true) , _openLinksByDirectClick(false) - , _isFixedSize(false) , _ctrlRequiredForDrag(true) , _tripleClickMode(Enum::SelectWholeLine) , _possibleTripleClick(false) @@ -1614,13 +1613,6 @@ void TerminalDisplay::resizeEvent(QResizeEvent*) void TerminalDisplay::propagateSize() { - if (_isFixedSize) { - setSize(_columns, _lines); - QWidget::setFixedSize(sizeHint()); - parentWidget()->adjustSize(); - parentWidget()->setFixedSize(parentWidget()->sizeHint()); - return; - } if (_image) updateImageSize(); } @@ -1702,19 +1694,17 @@ void TerminalDisplay::calcGeometry() break; } - if (!_isFixedSize) { - // ensure that display is always at least one column wide - _columns = qMax(1, _contentRect.width() / _fontWidth); - _usedColumns = qMin(_usedColumns, _columns); + // ensure that display is always at least one column wide + _columns = qMax(1, _contentRect.width() / _fontWidth); + _usedColumns = qMin(_usedColumns, _columns); - // ensure that display is always at least one line high - _lines = qMax(1, _contentRect.height() / _fontHeight); - _usedLines = qMin(_usedLines, _lines); + // ensure that display is always at least one line high + _lines = qMax(1, _contentRect.height() / _fontHeight); + _usedLines = qMin(_usedLines, _lines); - if(_centerContents) { - QSize unusedPixels = _contentRect.size() - QSize(_columns * _fontWidth, _lines * _fontHeight); - _contentRect.adjust(unusedPixels.width() / 2, unusedPixels.height() / 2, 0, 0); - } + if(_centerContents) { + QSize unusedPixels = _contentRect.size() - QSize(_columns * _fontWidth, _lines * _fontHeight); + _contentRect.adjust(unusedPixels.width() / 2, unusedPixels.height() / 2, 0, 0); } } @@ -1734,24 +1724,6 @@ void TerminalDisplay::setSize(int columns, int lines) } } -void TerminalDisplay::setFixedSize(int cols, int lins) -{ - _isFixedSize = true; - - //ensure that display is at least one line by one column in size - _columns = qMax(1, cols); - _lines = qMax(1, lins); - _usedColumns = qMin(_usedColumns, _columns); - _usedLines = qMin(_usedLines, _lines); - - if (_image) { - delete[] _image; - makeImage(); - } - setSize(cols, lins); - QWidget::setFixedSize(_size); -} - QSize TerminalDisplay::sizeHint() const { return _size; diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h index 95fc0a051..f0699e92b 100644 --- a/src/TerminalDisplay.h +++ b/src/TerminalDisplay.h @@ -294,7 +294,6 @@ public: } void setSize(int columns, int lines); - void setFixedSize(int columns, int lines); // reimplemented QSize sizeHint() const; @@ -849,7 +848,6 @@ private: bool _underlineLinks; // Underline URL and hosts on mouse hover bool _openLinksByDirectClick; // Open URL and hosts by single mouse click - bool _isFixedSize; // columns/lines are locked. bool _ctrlRequiredForDrag; // require Ctrl key for drag selected text diff --git a/src/tests/TerminalTest.cpp b/src/tests/TerminalTest.cpp index 4c2e82b76..218a75105 100644 --- a/src/tests/TerminalTest.cpp +++ b/src/tests/TerminalTest.cpp @@ -96,14 +96,6 @@ void TerminalTest::testSize() // TODO: setSize doesn't change size... //display->setSize(80, 25); - display->setFixedSize(-1, -1); - QCOMPARE(display->columns(), 1); - QCOMPARE(display->lines(), 1); - - display->setFixedSize(80, 25); - QCOMPARE(display->columns(), 80); - QCOMPARE(display->lines(), 25); - delete display; }