Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

handle buffer offset #230

Merged
merged 1 commit into from
Sep 30, 2024
Merged

handle buffer offset #230

merged 1 commit into from
Sep 30, 2024

Conversation

cmeissl
Copy link
Contributor

@cmeissl cmeissl commented Feb 24, 2024

tracking of Smithay/smithay#1341

@cmeissl
Copy link
Contributor Author

cmeissl commented Sep 14, 2024

@YaLTeR This is now just waiting for the review of Smithay/smithay#1341

@@ -297,13 +297,42 @@ impl CompositorHandler for State {
&self.niri.cursor_manager.cursor_image(),
CursorImageStatus::Surface(s) if s == &root_surface
) {
with_states(surface, |states| {
Copy link
Owner

Choose a reason for hiding this comment

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

Guess this should only happen if surface == root_surface

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right, while unlikely the surface could be part of a surface tree

if self.niri.dnd_icon.as_ref() == Some(&root_surface) {
if matches!(&self.niri.dnd_icon, Some(icon) if icon.surface == root_surface) {
let dnd_icon = self.niri.dnd_icon.as_mut().unwrap();
with_states(&dnd_icon.surface, |states| {
Copy link
Owner

Choose a reason for hiding this comment

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

Guess this can only change if surface == root_surface

src/input/mod.rs Outdated
@@ -2754,8 +2750,8 @@ mod tests {
// The key_code we pick is arbitrary, the only thing
// that matters is that they are different between cases.

let close_key_code = close_keysym.into();
let close_key_event = |suppr: &mut HashSet<u32>, mods: ModifiersState, pressed| {
let close_key_code = Keycode::from(close_keysym.raw() + 8u32);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure about the offset here tbh

@YaLTeR YaLTeR enabled auto-merge (rebase) September 30, 2024 11:55
@YaLTeR YaLTeR merged commit eb190e3 into YaLTeR:main Sep 30, 2024
10 checks passed
@YaLTeR
Copy link
Owner

YaLTeR commented Sep 30, 2024

Thanks

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.

2 participants