From 4adf621a0f137ae26092eb7c25baacdd1d62a6a6 Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Tue, 27 Aug 2024 00:45:22 -0600 Subject: [PATCH 1/3] window-zoom: Track wlroots-0.18 --- src/window-zoom.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/window-zoom.cpp b/src/window-zoom.cpp index f87dbe0..6fa5614 100644 --- a/src/window-zoom.cpp +++ b/src/window-zoom.cpp @@ -317,7 +317,7 @@ class wayfire_winzoom : public wf::per_output_plugin_instance_t wf::axis_callback axis_cb = [=] (wlr_pointer_axis_event *ev) { auto view = toplevel_cast(wf::get_core().get_cursor_focus_view()); - if (ev->orientation == WLR_AXIS_ORIENTATION_VERTICAL) + if (ev->orientation == WL_POINTER_AXIS_VERTICAL_SCROLL) { auto delta = (int)-std::clamp(ev->delta, -1.0, 1.0); return update_winzoom(view, wf::point_t{delta, delta}); From 960535e25b87bd552c71f17e209ea6d58e92eee2 Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Tue, 27 Aug 2024 01:33:31 -0600 Subject: [PATCH 2/3] pixdecor: Update subprject to track-wlroots-0.18 branch --- subprojects/pixdecor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/pixdecor b/subprojects/pixdecor index 18779dd..a65cf1e 160000 --- a/subprojects/pixdecor +++ b/subprojects/pixdecor @@ -1 +1 @@ -Subproject commit 18779dd970c703d3437173ee7f640aa210ec69ea +Subproject commit a65cf1ed678682e654ef60af26b6ea2a3b34fc85 From df42bc757a5bcfd031179db2d824ba57d12d3fe2 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sat, 31 Aug 2024 01:15:12 -0700 Subject: [PATCH 3/3] subprojects: Update subprojects for track-wlroots-0.18 branch again (#260) --- subprojects/filters | 2 +- subprojects/wayfire-shadows | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/filters b/subprojects/filters index 0a9be84..c5d0b39 160000 --- a/subprojects/filters +++ b/subprojects/filters @@ -1 +1 @@ -Subproject commit 0a9be8478560fd84be2e427a4be076a44bf079b9 +Subproject commit c5d0b39a63cc1b140ef03f056458d054e399caa9 diff --git a/subprojects/wayfire-shadows b/subprojects/wayfire-shadows index 81699f6..11c8ab6 160000 --- a/subprojects/wayfire-shadows +++ b/subprojects/wayfire-shadows @@ -1 +1 @@ -Subproject commit 81699f6e4be65dcf3f7ad5155dfb4247b37b7997 +Subproject commit 11c8ab63c1cde663a38502c6ecaeec980920c4d1