Revert "Show the scrollbar only when needed"

This reverts commit 05f2469c1a.
wilder-portage
Tomaz Canabrava 8 years ago
parent da71ee20da
commit 452cced03e
  1. 17
      src/TerminalDisplay.cpp

@ -2122,12 +2122,7 @@ void TerminalDisplay::setScrollBarPosition(Enum::ScrollBarPositionEnum position)
return; return;
} }
if (position == Enum::ScrollBarHidden) { _scrollBar->setVisible(position != Enum::ScrollBarHidden);
_scrollBar->hide();
} else if (_scrollBar->maximum() != 0) {
_scrollBar->show();
}
_scrollbarLocation = position; _scrollbarLocation = position;
propagateSize(); propagateSize();
@ -2159,14 +2154,10 @@ void TerminalDisplay::setScroll(int cursor, int slines)
// //
// setting the range or value of a _scrollBar will always trigger // setting the range or value of a _scrollBar will always trigger
// a repaint, so it should be avoided if it is not necessary // a repaint, so it should be avoided if it is not necessary
if (_scrollBar->minimum() == 0 &&
if (_scrollBar->maximum() == 0 && _scrollBar->value() == cursor) { _scrollBar->maximum() == (slines - _lines) &&
// hide the scrollbar if it's not needed _scrollBar->value() == cursor) {
_scrollBar->hide();
return; return;
} else if (_scrollbarLocation != Enum::ScrollBarHidden){
_scrollBar->show();
} }
disconnect(_scrollBar, &QScrollBar::valueChanged, this, &Konsole::TerminalDisplay::scrollBarPositionChanged); disconnect(_scrollBar, &QScrollBar::valueChanged, this, &Konsole::TerminalDisplay::scrollBarPositionChanged);

Loading…
Cancel
Save