From 2f3accf3cbd15ef95060a2726d8977b84b201852 Mon Sep 17 00:00:00 2001 From: fourst4r Date: Sun, 27 Sep 2020 01:47:20 +1200 Subject: [PATCH] fix a crash using middle click scroll on chat window (#1870) * fix middle click scroll crash * Update CHANGELOG.md * get the float dpi, not int --- CHANGELOG.md | 1 + src/widgets/helper/ChannelView.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ebaf1aa..dc19e978 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ - Bugfix: MacOS updater looked for non-existing fields, causing it to always fail the update check (#1642) - Bugfix: Fixed message menu crashing if the message you right-clicked goes out of scope before you select an action (#1783) (#1787) - Bugfix: Fixed alternate messages flickering in UserInfoPopup when clicking Refresh if there was an odd number of messages in there (#1789 #1810) +- Bugfix: Fix a crash when using middle click scroll on a chat window. (#1870) - Settings open faster - Dev: Fully remove Twitch Chatroom support - Dev: Handle conversion of historical CLEARCHAT messages to NOTICE messages in Chatterino instead of relying on the Recent Messages API to handle it for us. (#1804) diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp index f9dca666..6d4f5048 100644 --- a/src/widgets/helper/ChannelView.cpp +++ b/src/widgets/helper/ChannelView.cpp @@ -1969,8 +1969,7 @@ void ChannelView::disableScrolling() void ChannelView::scrollUpdateRequested() { - const qreal dpi = - QGuiApplication::screenAt(this->pos())->devicePixelRatio(); + const qreal dpi = this->devicePixelRatioF(); const qreal delta = dpi * (this->currentMousePosition_.y() - this->lastMiddlePressPosition_.y()); const int cursorHeight = this->cursors_.neutral.pixmap().height();