Skip to content

fix: apply scroll lock setting on initialization - #9043

Merged
sithlord48 merged 1 commit into
deskflow:masterfrom
enzious:fix/scroll-lock-setting-not-applied
Oct 17, 2025
Merged

fix: apply scroll lock setting on initialization#9043
sithlord48 merged 1 commit into
deskflow:masterfrom
enzious:fix/scroll-lock-setting-not-applied

Conversation

@enzious

@enzious enzious commented Oct 15, 2025

Copy link
Copy Markdown
Contributor

Fixes small issue with scroll lock setting not being applied on initialization. Also added a log for when no barriers are found.

sithlord48
sithlord48 previously approved these changes Oct 15, 2025

@sithlord48 sithlord48 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seams to work .

@sithlord48
sithlord48 requested a review from nbolton October 15, 2025 03:08
@nbolton
nbolton force-pushed the fix/scroll-lock-setting-not-applied branch from 1dd86c1 to cc59917 Compare October 15, 2025 13:36
@sithlord48
sithlord48 force-pushed the fix/scroll-lock-setting-not-applied branch from cc59917 to b39a5d0 Compare October 15, 2025 13:39
@sithlord48
sithlord48 enabled auto-merge (rebase) October 15, 2025 13:39
Comment thread src/lib/platform/PortalInputCapture.cpp Outdated
@enzious

enzious commented Oct 15, 2025

Copy link
Copy Markdown
Contributor Author

Dang, I butchered that commit text. The enter key is way to close to backspace.

@sithlord48 sithlord48 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not fix staged commits with new commits.

Edit: be sure to rebase also

@enzious
enzious force-pushed the fix/scroll-lock-setting-not-applied branch from cb7ceb5 to 28136f1 Compare October 15, 2025 18:08
@enzious
enzious requested review from nbolton and sithlord48 October 15, 2025 20:54

@sithlord48 sithlord48 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not fix staged commits with new commits. (i.e your 3rd commit should be part of where the warning was created.)

@enzious
enzious force-pushed the fix/scroll-lock-setting-not-applied branch from 28136f1 to 9314a26 Compare October 15, 2025 22:01
@enzious

enzious commented Oct 15, 2025

Copy link
Copy Markdown
Contributor Author

I'm assuming you mean squash the commits... sorry

@enzious
enzious requested a review from sithlord48 October 15, 2025 22:03
@sithlord48

Copy link
Copy Markdown
Member

I did not just that you should have made the correction part of the commit where it was first created not an additional commit. The squash works here as well. Thanks for the Fix !

@sithlord48
sithlord48 enabled auto-merge (rebase) October 15, 2025 22:10
@sithlord48

Copy link
Copy Markdown
Member

@enzious does this fix any open issues ?

@enzious

enzious commented Oct 16, 2025

Copy link
Copy Markdown
Contributor Author

@enzious does this fix any open issues ?

Not that I could find

@sithlord48
sithlord48 force-pushed the fix/scroll-lock-setting-not-applied branch from 9314a26 to d81fa16 Compare October 16, 2025 15:57
@sithlord48
sithlord48 disabled auto-merge October 16, 2025 15:57
@sithlord48
sithlord48 enabled auto-merge (rebase) October 16, 2025 15:58
@sithlord48
sithlord48 merged commit 78e394a into deskflow:master Oct 17, 2025
28 checks passed
@enzious
enzious deleted the fix/scroll-lock-setting-not-applied branch October 18, 2025 10:11
@nbolton

nbolton commented Oct 30, 2025

Copy link
Copy Markdown
Member

A couple of things I noticed while testing this fix:

  1. The 'lock to screen' setting was still disabled (with scroll lock I could transition) as expected prior to the change, but the message being shown on startup was indeed confusing (so it's good that we fixed that)
  2. Lock to screen doesn't work on Wayland server (at least not for me on GNOME), so not possible to test fully on Wayland

@sithlord48

Copy link
Copy Markdown
Member

Hotkeys wont work on wayland until we impliment the hotkey portal

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants