Add option to disable ctrl+<mouse-wheel> zooming (#114)

linuxdeepin · Feb 16, 2023 · abb19ab · abb19ab
1 parent b7bde02
commit abb19ab
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/src/assets/other/default-config.json b/src/assets/other/default-config.json
@@ -341,6 +341,12 @@
                             "type": "checkbox",
                             "text": "Scroll on output",
                             "default": true
+                        },
+                        {
+                            "key": "zoom_on_ctrl_scrollwheel",
+                            "type": "checkbox",
+                            "text": "Allow Ctrl+scrollwheel to zoom text size",
+                            "default": true
                         }
                     ]
                 },

diff --git a/src/settings/settings.cpp b/src/settings/settings.cpp
@@ -381,6 +381,11 @@ bool Settings::OutputtingScroll()
     return settings->option("advanced.scroll.scroll_on_output")->value().toBool();
 }
 
+bool Settings::ScrollWheelZoom()
+{
+    return settings->option("advanced.scroll.zoom_on_ctrl_scrollwheel")->value().toBool();
+}
+
 /*******************************************************************************
  1. @函数:    reload
  2. @作者:    ut001121 zhangmeng

diff --git a/src/settings/settings.h b/src/settings/settings.h
@@ -103,6 +103,12 @@ class Settings : public QObject
      * @return
      */
     bool OutputtingScroll();
+    /**
+     * @brief 设置界面获取是否允许Ctrl+滚轮扩缩字体
+     * @author chenzhiwei
+     * @return
+     */
+    bool ScrollWheelZoom();
 //    void reload();
     /**
      * @brief 标签标题

diff --git a/src/views/termwidget.cpp b/src/views/termwidget.cpp
@@ -1141,7 +1141,7 @@ inline void TermWidget::onTouchPadSignal(QString name, QString direction, int fi
 {
     qInfo() << name << direction << fingers;
     // 当前窗口被激活,且有焦点
-    if (isActiveWindow() && hasFocus()) {
+    if (isActiveWindow() && hasFocus() && Settings::instance()->ScrollWheelZoom()) {
         if (name == "pinch" && fingers == 2) {
             if (direction == "in") {
                 // 捏合 in是手指捏合的方向 向内缩小
@@ -1176,7 +1176,7 @@ void TermWidget::onShellMessage(QString currentShell, bool isSuccess)
 void TermWidget::wheelEvent(QWheelEvent *event)
 {
     // 当前窗口被激活,且有焦点
-    if (isActiveWindow() && hasFocus()) {
+    if (isActiveWindow() && hasFocus() && Settings::instance()->ScrollWheelZoom()) {
         if (Qt::ControlModifier == event->modifiers()) {
             int directionY = event->angleDelta().y();
             if (directionY < 0) {