RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-08-07 18:07:47 +00:00
Code Issues Activity Actions

Userland: Add horizontal mouse scroll support

Browse source
This commit is contained in:
Dmitry Petrov 2021-12-13 23:22:28 +01:00 • committed by Andreas Kling
parent d61cc47055
commit 1662213737
43 changed files with 112 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/3DFileViewer/main.cpp
View file

@ -156,7 +156,7 @@ void GLContextWidget::mousemove_event(GUI::MouseEvent& event)
void GLContextWidget::mousewheel_event(GUI::MouseEvent& event)
{
if (event.wheel_delta() > 0)
if (event.wheel_delta_y() > 0)
m_zoom /= 1.1f;
else
m_zoom *= 1.1f;

2
Userland/Applications/PDFViewer/PDFViewer.cpp
View file

@ -75,7 +75,7 @@ void PDFViewer::mousewheel_event(GUI::MouseEvent& event)
if (!m_document)
return;
bool scrolled_down = event.wheel_delta() > 0;
bool scrolled_down = event.wheel_delta_y() > 0;
if (event.ctrl()) {
if (scrolled_down) {

9
Userland/Applications/Piano/RollWidget.cpp
View file

@ -239,7 +239,12 @@ void RollWidget::mouseup_event([[maybe_unused]] GUI::MouseEvent& event)
void RollWidget::mousewheel_event(GUI::MouseEvent& event)
{
if (event.modifiers() & KeyModifier::Mod_Shift) {
horizontal_scrollbar().increase_slider_by(event.wheel_delta() * horizontal_scroll_sensitivity);
horizontal_scrollbar().increase_slider_by(event.wheel_delta_y() * horizontal_scroll_sensitivity);
return;
}
if (event.wheel_delta_x() != 0) {
horizontal_scrollbar().increase_slider_by(event.wheel_delta_x() * horizontal_scroll_sensitivity);
return;
}
@ -248,7 +253,7 @@ void RollWidget::mousewheel_event(GUI::MouseEvent& event)
return;
}
double multiplier = event.wheel_delta() >= 0 ? 0.5 : 2;
double multiplier = event.wheel_delta_y() >= 0 ? 0.5 : 2;
if (m_zoom_level * multiplier > max_zoom)
return;

6
Userland/Applications/PixelPaint/ImageEditor.cpp
View file

@ -257,7 +257,8 @@ GUI::MouseEvent ImageEditor::event_with_pan_and_scale_applied(GUI::MouseEvent co
event.buttons(),
event.button(),
event.modifiers(),
event.wheel_delta()
event.wheel_delta_x(),
event.wheel_delta_y(),
};
}
@ -271,7 +272,8 @@ GUI::MouseEvent ImageEditor::event_adjusted_for_layer(GUI::MouseEvent const& eve
event.buttons(),
event.button(),
event.modifiers(),
event.wheel_delta()
event.wheel_delta_x(),
event.wheel_delta_y(),
};
}

4
Userland/Applications/SpaceAnalyzer/TreeMapWidget.cpp
View file

@ -316,8 +316,8 @@ void TreeMapWidget::doubleclick_event(GUI::MouseEvent& event)
void TreeMapWidget::mousewheel_event(GUI::MouseEvent& event)
{
int delta = event.wheel_delta();
// FIXME: The wheel_delta is premultiplied in the window server, we actually want a raw value here.
int delta = event.wheel_delta_y();
// FIXME: The wheel_delta_y is premultiplied in the window server, we actually want a raw value here.
int step_size = GUI::WindowServerConnection::the().get_scroll_step_size();
if (delta > 0) {
size_t step_back = delta / step_size;