From 394009dda8e1b3f135caa55b20f54ca69a89723c Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Mon, 11 Jun 2018 15:04:54 +0200
Subject: [PATCH] added ui scaling

---
 src/util/clamp.hpp                 | 2 --
 src/widgets/helper/channelview.cpp | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/util/clamp.hpp b/src/util/clamp.hpp
index c392b9d24..767c0f1cf 100644
--- a/src/util/clamp.hpp
+++ b/src/util/clamp.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <functional>
-
 namespace chatterino {
 namespace util {
 
diff --git a/src/widgets/helper/channelview.cpp b/src/widgets/helper/channelview.cpp
index 237706c6d..e75c570f3 100644
--- a/src/widgets/helper/channelview.cpp
+++ b/src/widgets/helper/channelview.cpp
@@ -660,6 +660,11 @@ void ChannelView::wheelEvent(QWheelEvent *event)
     this->pausedTemporarily_ = false;
     this->updatePauseStatus();
 
+    if (event->modifiers() & Qt::ControlModifier) {
+        event->ignore();
+        return;
+    }
+
     if (this->scrollBar_.isVisible()) {
         auto app = getApp();