noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixes #113

Browse source
This commit is contained in:
fourtf 2018-01-05 02:55:24 +01:00
parent d8ba745a35
commit fd8ddcff55
1 changed files with 53 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/widgets/helper/channelview.cpp
View file

@ -815,8 +815,59 @@ void ChannelView::wheelEvent(QWheelEvent *event)
if (this->scrollBar.isVisible()) { if (this->scrollBar.isVisible()) {
float mouseMultiplier = singletons::SettingManager::getInstance().mouseScrollMultiplier; float mouseMultiplier = singletons::SettingManager::getInstance().mouseScrollMultiplier;
this->scrollBar.setDesiredValue( float desired = this->scrollBar.getDesiredValue();
this->scrollBar.getDesiredValue() - event->delta() / 10.0 * mouseMultiplier, true); float delta = event->delta() * 1.5 * mouseMultiplier;
auto snapshot = this->getMessagesSnapshot();
int i = std::min((int)desired, (int)snapshot.getLength());
if (delta > 0) {
float scrollFactor = fmod(desired, 1);
float currentScrollLeft = (int)(scrollFactor * snapshot[i]->getHeight());
for (; i >= 0; i--) {
if (delta < currentScrollLeft) {
desired -= scrollFactor * (delta / currentScrollLeft);
break;
} else {
delta -= currentScrollLeft;
desired -= scrollFactor;
}
if (i == 0) {
desired = 0;
} else {
snapshot[i - 1]->layout(this->width(), this->getDpiMultiplier());
scrollFactor = 1;
currentScrollLeft = snapshot[i - 1]->getHeight();
}
}
} else {
delta = -delta;
float scrollFactor = 1 - fmod(desired, 1);
float currentScrollLeft = (int)(scrollFactor * snapshot[i]->getHeight());
for (; i < snapshot.getLength(); i++) {
if (delta < currentScrollLeft) {
desired += scrollFactor * ((double)delta / currentScrollLeft);
break;
} else {
delta -= currentScrollLeft;
desired += scrollFactor;
}
if (i == snapshot.getLength() - 1) {
desired = snapshot.getLength();
} else {
snapshot[i + 1]->layout(this->width(), this->getDpiMultiplier());
scrollFactor = 1;
currentScrollLeft = snapshot[i + 1]->getHeight();
}
}
}
this->scrollBar.setDesiredValue(desired, true);
} }
} }