From b398acfbd4895e6332df9357a0bde8f8bf2e1f90 Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Mon, 19 Nov 2012 23:10:35 -0600 Subject: [PATCH 01/12] Add zoom. Add choice action after paste clipboard --- CMakeLists.txt.user | 146 ++++++++++++++++++++++++++++++++++++++++ lib/TerminalDisplay.cpp | 23 ++++++- lib/TerminalDisplay.h | 18 ++++- lib/qtermwidget.cpp | 12 ++++ lib/qtermwidget.h | 6 +- src/main.cpp | 6 +- 6 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 CMakeLists.txt.user diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user new file mode 100644 index 0000000..30599a8 --- /dev/null +++ b/CMakeLists.txt.user @@ -0,0 +1,146 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + true + 1 + true + 1 + true + 2 + 8 + true + 1 + false + true + false + true + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + + CMakeProjectManager.DefaultCMakeTarget + 0 + 0 + 0 + + /home/francisco/Documentos/Desarrollo/git/qtermwidget-build + ProjectExplorer.ToolChain.Gcc:{84586ad0-f048-47e8-813a-5e9c5be87284} + ProjectExplorer.ToolChain.Gcc:{84586ad0-f048-47e8-813a-5e9c5be87284} + + + + + false + true + Make + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + clean + + true + true + Make + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + all + + CMakeProjectManager.CMakeBuildConfiguration + + 1 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + No deployment + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + 2 + test + + false + + + test + + CMakeProjectManager.CMakeRunConfiguration. + 3768 + true + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {4024c359-f0e5-499d-b6dc-dd7c55d4c58c} + + + ProjectExplorer.Project.Updater.FileVersion + 11 + + diff --git a/lib/TerminalDisplay.cpp b/lib/TerminalDisplay.cpp index 7811e18..5cc44af 100644 --- a/lib/TerminalDisplay.cpp +++ b/lib/TerminalDisplay.cpp @@ -337,6 +337,7 @@ TerminalDisplay::TerminalDisplay(QWidget *parent) ,_blendColor(qRgba(0,0,0,0xff)) ,_filterChain(new TerminalImageFilterChain()) ,_cursorShape(BlockCursor) +,mMotionAfterPasting(NoMoveScreenWindow) { // terminal applications are not designed with Right-To-Left in mind, // so the layout is forced to Left-To-Right @@ -2512,6 +2513,16 @@ void TerminalDisplay::setFlowControlWarningEnabled( bool enable ) outputSuspended(false); } +void TerminalDisplay::setMotionAfterPasting(MotionAfterPasting action) +{ + mMotionAfterPasting = action; +} + +int TerminalDisplay::motionAfterPasting() +{ + return mMotionAfterPasting; +} + void TerminalDisplay::keyPressEvent( QKeyEvent* event ) { bool emitKeyPressSignal = true; @@ -2580,7 +2591,17 @@ void TerminalDisplay::keyPressEvent( QKeyEvent* event ) || event->modifiers().testFlag(Qt::ControlModifier) || event->modifiers().testFlag(Qt::AltModifier))) { - scrollToEnd(); + switch(mMotionAfterPasting) + { + case MoveStartScreenWindow: + _screenWindow->scrollTo(0); + break; + case MoveEndScreenWindow: + scrollToEnd(); + break; + case NoMoveScreenWindow: + break; + } } } diff --git a/lib/TerminalDisplay.h b/lib/TerminalDisplay.h index 6e818d5..4e3f87c 100644 --- a/lib/TerminalDisplay.h +++ b/lib/TerminalDisplay.h @@ -51,6 +51,17 @@ class QWidget; namespace Konsole { + enum MotionAfterPasting + { + // No move screenwindow after pasting + NoMoveScreenWindow = 0, + // Move start of screenwindow after pasting + MoveStartScreenWindow = 1, + // Move end of screenwindow after pasting + MoveEndScreenWindow = 2 + }; + + extern unsigned short vt100_graphics[32]; class ScreenWindow; @@ -414,7 +425,10 @@ public: ScreenWindow* screenWindow() const; static bool HAVE_TRANSPARENCY; - + + void setMotionAfterPasting(MotionAfterPasting action); + int motionAfterPasting(); + public slots: /** @@ -794,6 +808,8 @@ private: QColor _cursorColor; + MotionAfterPasting mMotionAfterPasting; + struct InputMethodData { QString preeditString; diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index a21bd75..5dbd58b 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -329,6 +329,13 @@ void QTermWidget::pasteClipboard() m_impl->m_terminalDisplay->pasteClipboard(); } +void QTermWidget::setZoom(uint step) +{ + QFont font = m_impl->m_terminalDisplay->getVTFont(); + font.setPixelSize(font.pointSize() + step > 5 ? font.pointSize() + step: font.pointSize()); + m_impl->m_terminalDisplay->setVTFont(font); +} + void QTermWidget::setKeyBindings(const QString & kb) { m_impl->m_session->setKeyBindings(kb); @@ -373,3 +380,8 @@ void QTermWidget::setEnvironment(const QStringList& environment) { m_impl->m_session->setEnvironment(environment); } + +void QTermWidget::setMotionAfterPasting(int action) +{ + m_impl->m_terminalDisplay->setMotionAfterPasting((Konsole::MotionAfterPasting) action); +} diff --git a/lib/qtermwidget.h b/lib/qtermwidget.h index db3d699..68a5b10 100644 --- a/lib/qtermwidget.h +++ b/lib/qtermwidget.h @@ -38,7 +38,6 @@ public: ScrollBarRight=2 }; - //Creation of widget QTermWidget(int startnow, // 1 = start shell programm immediatelly QWidget * parent = 0); @@ -119,6 +118,8 @@ public: //! Return current key bindings QString keyBindings(); + + void setMotionAfterPasting(int); signals: void finished(); @@ -136,6 +137,9 @@ public slots: // Copies selection to clipboard void pasteClipboard(); + // Set zoom + void setZoom(uint step); + /*! Set named key binding for given widget */ void setKeyBindings(const QString & kb); diff --git a/src/main.cpp b/src/main.cpp index 25bccb0..0365897 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,12 +21,14 @@ #include #include #include +#include #include "qtermwidget.h" int main(int argc, char *argv[]) { - QApplication app(argc, argv); + setenv("TERM", "xterm", 1); + QApplication app(argc, argv); QMainWindow *mainWindow = new QMainWindow(); QTermWidget *console = new QTermWidget(); @@ -41,7 +43,7 @@ int main(int argc, char *argv[]) console->setTerminalFont(font); - //console->setColorScheme(COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW); + // console->setColorScheme(COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW); console->setScrollBarPosition(QTermWidget::ScrollBarRight); foreach (QString arg, QApplication::arguments()) From 8dad0df7b3c3777a18cb99eaa1763457bc936c12 Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Mon, 19 Nov 2012 23:11:17 -0600 Subject: [PATCH 02/12] Add zoom. Add choice action after paste clipboard --- CMakeLists.txt.user | 146 -------------------------------------------- 1 file changed, 146 deletions(-) delete mode 100644 CMakeLists.txt.user diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user deleted file mode 100644 index 30599a8..0000000 --- a/CMakeLists.txt.user +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - true - 1 - true - 1 - true - 2 - 8 - true - 1 - false - true - false - true - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - - CMakeProjectManager.DefaultCMakeTarget - 0 - 0 - 0 - - /home/francisco/Documentos/Desarrollo/git/qtermwidget-build - ProjectExplorer.ToolChain.Gcc:{84586ad0-f048-47e8-813a-5e9c5be87284} - ProjectExplorer.ToolChain.Gcc:{84586ad0-f048-47e8-813a-5e9c5be87284} - - - - - false - true - Make - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - clean - - true - true - Make - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - all - - CMakeProjectManager.CMakeBuildConfiguration - - 1 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - No deployment - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - 2 - test - - false - - - test - - CMakeProjectManager.CMakeRunConfiguration. - 3768 - true - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {4024c359-f0e5-499d-b6dc-dd7c55d4c58c} - - - ProjectExplorer.Project.Updater.FileVersion - 11 - - From 83b87fe72607b458a971e4dc5aaa67db19577be0 Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Mon, 19 Nov 2012 23:32:29 -0600 Subject: [PATCH 03/12] Fix logical error --- lib/TerminalDisplay.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/TerminalDisplay.cpp b/lib/TerminalDisplay.cpp index 5cc44af..4318b06 100644 --- a/lib/TerminalDisplay.cpp +++ b/lib/TerminalDisplay.cpp @@ -2587,10 +2587,12 @@ void TerminalDisplay::keyPressEvent( QKeyEvent* event ) { emit keyPressedSignal(event); - if(!(event->modifiers().testFlag(Qt::ShiftModifier) + if(event->modifiers().testFlag(Qt::ShiftModifier) || event->modifiers().testFlag(Qt::ControlModifier) - || event->modifiers().testFlag(Qt::AltModifier))) + || event->modifiers().testFlag(Qt::AltModifier)) { + qDebug() << mMotionAfterPasting; + switch(mMotionAfterPasting) { case MoveStartScreenWindow: From d0303eaa4a595695bc522b04383851a35309f1f0 Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 00:41:03 -0600 Subject: [PATCH 04/12] Add zoom. Add choice action after paste clipboard --- lib/TerminalDisplay.cpp | 9 ++++++--- lib/qtermwidget.cpp | 12 +++++++++++- lib/qtermwidget.h | 4 +++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/lib/TerminalDisplay.cpp b/lib/TerminalDisplay.cpp index 4318b06..75b3c51 100644 --- a/lib/TerminalDisplay.cpp +++ b/lib/TerminalDisplay.cpp @@ -338,6 +338,7 @@ TerminalDisplay::TerminalDisplay(QWidget *parent) ,_filterChain(new TerminalImageFilterChain()) ,_cursorShape(BlockCursor) ,mMotionAfterPasting(NoMoveScreenWindow) +,m_stepzoom(3) { // terminal applications are not designed with Right-To-Left in mind, // so the layout is forced to Left-To-Right @@ -2532,7 +2533,7 @@ void TerminalDisplay::keyPressEvent( QKeyEvent* event ) { bool update = true; - if ( event->key() == Qt::Key_PageUp ) + else if ( event->key() == Qt::Key_PageUp ) { _screenWindow->scrollBy( ScreenWindow::ScrollPages , -1 ); } @@ -2591,8 +2592,6 @@ void TerminalDisplay::keyPressEvent( QKeyEvent* event ) || event->modifiers().testFlag(Qt::ControlModifier) || event->modifiers().testFlag(Qt::AltModifier)) { - qDebug() << mMotionAfterPasting; - switch(mMotionAfterPasting) { case MoveStartScreenWindow: @@ -2605,6 +2604,10 @@ void TerminalDisplay::keyPressEvent( QKeyEvent* event ) break; } } + else + { + scrollToEnd(); + } } event->accept(); diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index 5dbd58b..0e1404b 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -329,13 +329,23 @@ void QTermWidget::pasteClipboard() m_impl->m_terminalDisplay->pasteClipboard(); } -void QTermWidget::setZoom(uint step) +void QTermWidget::setZoom(int step) { QFont font = m_impl->m_terminalDisplay->getVTFont(); font.setPixelSize(font.pointSize() + step > 5 ? font.pointSize() + step: font.pointSize()); m_impl->m_terminalDisplay->setVTFont(font); } +void QTermWidget::zoomIn() +{ + setZoom(2); +} + +void QTermWidget::zoomOut() +{ + setZoom(-2); +} + void QTermWidget::setKeyBindings(const QString & kb) { m_impl->m_session->setKeyBindings(kb); diff --git a/lib/qtermwidget.h b/lib/qtermwidget.h index 68a5b10..65aaf45 100644 --- a/lib/qtermwidget.h +++ b/lib/qtermwidget.h @@ -138,7 +138,8 @@ public slots: void pasteClipboard(); // Set zoom - void setZoom(uint step); + void zoomIn(); + void zoomOut(); /*! Set named key binding for given widget */ @@ -156,6 +157,7 @@ protected slots: void selectionChanged(bool textSelected); private: + void setZoom(int step); void init(int startnow); TermWidgetImpl * m_impl; }; From 60d5b46319ac29f60646e4966ef7c82be3c4066d Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 00:44:29 -0600 Subject: [PATCH 05/12] Add zoom. Add choice action after paste clipboard --- lib/TerminalDisplay.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/TerminalDisplay.cpp b/lib/TerminalDisplay.cpp index 75b3c51..c7f76a5 100644 --- a/lib/TerminalDisplay.cpp +++ b/lib/TerminalDisplay.cpp @@ -338,7 +338,6 @@ TerminalDisplay::TerminalDisplay(QWidget *parent) ,_filterChain(new TerminalImageFilterChain()) ,_cursorShape(BlockCursor) ,mMotionAfterPasting(NoMoveScreenWindow) -,m_stepzoom(3) { // terminal applications are not designed with Right-To-Left in mind, // so the layout is forced to Left-To-Right @@ -2533,7 +2532,7 @@ void TerminalDisplay::keyPressEvent( QKeyEvent* event ) { bool update = true; - else if ( event->key() == Qt::Key_PageUp ) + if ( event->key() == Qt::Key_PageUp ) { _screenWindow->scrollBy( ScreenWindow::ScrollPages , -1 ); } From 677c7d14e4c467af5bab00b9b8cbddf6b41dedc0 Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 09:59:38 -0600 Subject: [PATCH 06/12] Add zoom. Add choice action after paste clipboard --- lib/qtermwidget.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index 0e1404b..ac2e2c8 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -332,18 +332,19 @@ void QTermWidget::pasteClipboard() void QTermWidget::setZoom(int step) { QFont font = m_impl->m_terminalDisplay->getVTFont(); - font.setPixelSize(font.pointSize() + step > 5 ? font.pointSize() + step: font.pointSize()); + font.setPixelSize(font.pixelSize() + step > 6 && font.pixelSize() + step < 72 + ? font.pixelSize() + step: font.pixelSize()); m_impl->m_terminalDisplay->setVTFont(font); } void QTermWidget::zoomIn() { - setZoom(2); + setZoom(5); } void QTermWidget::zoomOut() { - setZoom(-2); + setZoom(-5); } void QTermWidget::setKeyBindings(const QString & kb) From 8489fdc36180da3c6a0a0b03c30c275aa00cb17d Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 10:04:02 -0600 Subject: [PATCH 07/12] Add zoom. Add choice action after paste clipboard --- lib/qtermwidget.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index ac2e2c8..2308018 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -332,8 +332,7 @@ void QTermWidget::pasteClipboard() void QTermWidget::setZoom(int step) { QFont font = m_impl->m_terminalDisplay->getVTFont(); - font.setPixelSize(font.pixelSize() + step > 6 && font.pixelSize() + step < 72 - ? font.pixelSize() + step: font.pixelSize()); + font.setPixelSize(font.pixelSize() + step); m_impl->m_terminalDisplay->setVTFont(font); } From b1a4a38d682d76659ee3271022107be704bf09a4 Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 10:09:23 -0600 Subject: [PATCH 08/12] Add zoom. Add choice action after paste clipboard --- lib/qtermwidget.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index 2308018..6144cd8 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -28,6 +28,8 @@ #include "KeyboardTranslator.h" #include "ColorScheme.h" +#define STEP_ZOOM 3 + using namespace Konsole; void *createTermWidget(int startnow, void *parent) @@ -332,18 +334,18 @@ void QTermWidget::pasteClipboard() void QTermWidget::setZoom(int step) { QFont font = m_impl->m_terminalDisplay->getVTFont(); - font.setPixelSize(font.pixelSize() + step); + font.setPixelSize(font.pointSize() + step); m_impl->m_terminalDisplay->setVTFont(font); } void QTermWidget::zoomIn() { - setZoom(5); + setZoom(STEP_ZOOM); } void QTermWidget::zoomOut() { - setZoom(-5); + setZoom(-STEP_ZOOM); } void QTermWidget::setKeyBindings(const QString & kb) From 971b26e9add066afe7ae45ed9008e2c83c33e3df Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 10:13:20 -0600 Subject: [PATCH 09/12] Add zoom. Add choice action after paste clipboard --- lib/qtermwidget.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index 6144cd8..cbbaa25 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -334,7 +334,10 @@ void QTermWidget::pasteClipboard() void QTermWidget::setZoom(int step) { QFont font = m_impl->m_terminalDisplay->getVTFont(); + + qDebug() << font << font.pointSize(); font.setPixelSize(font.pointSize() + step); + qDebug() << font << font.pointSize() + step; m_impl->m_terminalDisplay->setVTFont(font); } From b0b7a9f1e41a0e1ab15b854b425978c80fcf53d9 Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 10:19:09 -0600 Subject: [PATCH 10/12] Add zoom. Add choice action after paste clipboard --- lib/qtermwidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index cbbaa25..25a50c4 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -335,9 +335,9 @@ void QTermWidget::setZoom(int step) { QFont font = m_impl->m_terminalDisplay->getVTFont(); - qDebug() << font << font.pointSize(); - font.setPixelSize(font.pointSize() + step); - qDebug() << font << font.pointSize() + step; + qDebug() << "Before" << font << "pointsize" << font.pointSize() << "pixelsize" << font.pixelSize(); + font.setPointSize(font.pointSize() + step); + qDebug() << "After" << font << "pointsize" << font.pointSize() << "pixelsize" << font.pixelSize(); m_impl->m_terminalDisplay->setVTFont(font); } From c06857b27da94614613ddf78573c56223353a9f7 Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 11:02:08 -0600 Subject: [PATCH 11/12] Add zoom. Add choice action after paste clipboard --- lib/qtermwidget.cpp | 14 +++++++++++--- lib/qtermwidget.h | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index 25a50c4..df993fd 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -209,6 +209,13 @@ void QTermWidget::setTerminalFont(QFont &font) m_impl->m_terminalDisplay->setVTFont(font); } +QFont QTermWidget::getTerminalFont() +{ + if (!m_impl->m_terminalDisplay) + return; + m_impl->m_terminalDisplay->getVTFont(); +} + void QTermWidget::setTerminalOpacity(qreal level) { if (!m_impl->m_terminalDisplay) @@ -333,12 +340,13 @@ void QTermWidget::pasteClipboard() void QTermWidget::setZoom(int step) { + if (!m_impl->m_terminalDisplay) + return; + QFont font = m_impl->m_terminalDisplay->getVTFont(); - qDebug() << "Before" << font << "pointsize" << font.pointSize() << "pixelsize" << font.pixelSize(); font.setPointSize(font.pointSize() + step); - qDebug() << "After" << font << "pointsize" << font.pointSize() << "pixelsize" << font.pixelSize(); - m_impl->m_terminalDisplay->setVTFont(font); + setTerminalFont(font); } void QTermWidget::zoomIn() diff --git a/lib/qtermwidget.h b/lib/qtermwidget.h index 65aaf45..4202d18 100644 --- a/lib/qtermwidget.h +++ b/lib/qtermwidget.h @@ -63,7 +63,7 @@ public: // USE ONLY FIXED-PITCH FONT! // otherwise symbols' position could be incorrect void setTerminalFont(QFont & font); - + QFont getTerminalFont(); void setTerminalOpacity(qreal level); //environment From 4caa4138984f7088557ce534c3df98aab8bb1dce Mon Sep 17 00:00:00 2001 From: Francisco Ballina Date: Tue, 20 Nov 2012 11:06:11 -0600 Subject: [PATCH 12/12] Add zoom. Add choice action after paste clipboard --- lib/qtermwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/qtermwidget.cpp b/lib/qtermwidget.cpp index df993fd..dfae5f6 100644 --- a/lib/qtermwidget.cpp +++ b/lib/qtermwidget.cpp @@ -212,8 +212,8 @@ void QTermWidget::setTerminalFont(QFont &font) QFont QTermWidget::getTerminalFont() { if (!m_impl->m_terminalDisplay) - return; - m_impl->m_terminalDisplay->getVTFont(); + return QFont(); + return m_impl->m_terminalDisplay->getVTFont(); } void QTermWidget::setTerminalOpacity(qreal level)