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
This commit is contained in:
fourst4r 2020-09-27 01:47:20 +12:00 committed by GitHub
parent 06cb88f6c2
commit 2f3accf3cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -40,6 +40,7 @@
- Bugfix: MacOS updater looked for non-existing fields, causing it to always fail the update check (#1642) - 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 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: 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 - Settings open faster
- Dev: Fully remove Twitch Chatroom support - 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) - 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)

View file

@ -1969,8 +1969,7 @@ void ChannelView::disableScrolling()
void ChannelView::scrollUpdateRequested() void ChannelView::scrollUpdateRequested()
{ {
const qreal dpi = const qreal dpi = this->devicePixelRatioF();
QGuiApplication::screenAt(this->pos())->devicePixelRatio();
const qreal delta = dpi * (this->currentMousePosition_.y() - const qreal delta = dpi * (this->currentMousePosition_.y() -
this->lastMiddlePressPosition_.y()); this->lastMiddlePressPosition_.y());
const int cursorHeight = this->cursors_.neutral.pixmap().height(); const int cursorHeight = this->cursors_.neutral.pixmap().height();