diff --git a/src/SessionController.cpp b/src/SessionController.cpp index 0c912958a..ba3b88658 100644 --- a/src/SessionController.cpp +++ b/src/SessionController.cpp @@ -662,7 +662,7 @@ void SessionController::setupExtraActions() connect(_codecAction, SIGNAL(triggered(QTextCodec*)), this, SLOT(changeCodec(QTextCodec*))); // Text Size - action = collection->addAction("enlarge-font", this, SLOT(increaseTextSize())); + action = collection->addAction("enlarge-font", this, SLOT(increaseFontSize())); action->setText(i18n("Enlarge Font")); action->setIcon(KIcon("format-font-size-more")); KShortcut enlargeFontShortcut = action->shortcut(); @@ -670,7 +670,7 @@ void SessionController::setupExtraActions() enlargeFontShortcut.setAlternate(QKeySequence(Qt::CTRL + Qt::Key_Equal)); action->setShortcut(enlargeFontShortcut); - action = collection->addAction("shrink-font", this, SLOT(decreaseTextSize())); + action = collection->addAction("shrink-font", this, SLOT(decreaseFontSize())); action->setText(i18n("Shrink Font")); action->setIcon(KIcon("format-font-size-less")); action->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Minus)); @@ -1196,20 +1196,14 @@ void SessionController::clearHistoryAndReset() clearHistory(); } -void SessionController::increaseTextSize() +void SessionController::increaseFontSize() { - QFont font = _view->getVTFont(); - font.setPointSizeF(font.pointSizeF() + 1); - _view->setVTFont(font); + _view->increaseFontSize(); } -void SessionController::decreaseTextSize() +void SessionController::decreaseFontSize() { - static const qreal MinimumFontSize = 6; - - QFont font = _view->getVTFont(); - font.setPointSizeF(qMax(font.pointSizeF() - 1, MinimumFontSize)); - _view->setVTFont(font); + _view->decreaseFontSize(); } void SessionController::monitorActivity(bool monitor) diff --git a/src/SessionController.h b/src/SessionController.h index cd5a9ff1b..9a488589d 100644 --- a/src/SessionController.h +++ b/src/SessionController.h @@ -207,10 +207,10 @@ public slots: void closeSession(); /** Increase font size */ - void increaseTextSize(); + void increaseFontSize(); /** Decrease font size */ - void decreaseTextSize(); + void decreaseFontSize(); private slots: // menu item handlers diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index fe902db49..7a0b988d4 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -224,6 +224,22 @@ void TerminalDisplay::setFont(const QFont &) // ignore font change request if not coming from konsole itself } +void TerminalDisplay::increaseFontSize() +{ + QFont font = getVTFont(); + font.setPointSizeF(font.pointSizeF() + 1); + setVTFont(font); +} + +void TerminalDisplay::decreaseFontSize() +{ + const qreal MinimumFontSize = 6; + + QFont font = getVTFont(); + font.setPointSizeF(qMax(font.pointSizeF() - 1, MinimumFontSize)); + setVTFont(font); +} + uint TerminalDisplay::lineSpacing() const { return _lineSpacing; @@ -2282,12 +2298,13 @@ void TerminalDisplay::wheelEvent(QWheelEvent* ev) // ctrl+ for zomming, like in konqueror and firefox if (ev->modifiers() & Qt::ControlModifier) { - if (ev->delta() > 0) - // wheel-up - _sessionController->increaseTextSize(); - else - // wheel-down - _sessionController->decreaseTextSize(); + if (ev->delta() > 0) { + // wheel-up for increasing font size + increaseFontSize(); + } else { + // wheel-down for decreasing font size + decreaseFontSize(); + } return; } diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h index ed97b783c..127f31b2b 100644 --- a/src/TerminalDisplay.h +++ b/src/TerminalDisplay.h @@ -329,6 +329,12 @@ public: */ void setVTFont(const QFont& font); + /** Increases the font size */ + void increaseFontSize(); + + /** Decreases the font size */ + void decreaseFontSize(); + /** * Specified whether anti-aliasing of text in the terminal display * is enabled or not. Defaults to enabled.