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

fix(wayland)!: hardcode client-side decorations; hardcode scale=1.0 #4906

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

jokeyrhyme
Copy link
Contributor

@jokeyrhyme jokeyrhyme commented Jan 30, 2024

  • this PR addresses some panics in Upgrade smithay-client-toolkit 0.17 #4777 (comment) by hardcoding client-side decorations (instead of trying to negotiate for server-side decorations) and hardcoding scale=1.0 (instead of using detected monitor/surface values)
  • this does mean user preferences are not honoured, however, the terminal is in a mostly usable state

future PRs:

@jokeyrhyme jokeyrhyme marked this pull request as ready for review January 30, 2024 10:13
@wez
Copy link
Owner

wez commented Feb 3, 2024

FWIW, I had this cherry-picked and rebased on top of my rebase of #4777 (which is now in main) and it would exit immediately after launch, so there is something not quite right here. My test is simple:

  • Run wayfire in a window of its own
  • WAYLAND_DISPLAY=wayland-1 ./target/debug/wezterm

that works in main but exits with this PR.

My display is hidpi, in case that is relevant

@jokeyrhyme
Copy link
Contributor Author

Huh, my display is scale=1.25 here, let me see...

let extra_height = (pixel_height - incr.base_height as i32) % incr.y as i32;
let desired_pixel_width = max(pixel_width - extra_width, min_width as i32);
let desired_pixel_height =
max(pixel_height - extra_height, min_height as i32);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It seems these changes from #4866 were lost

@jokeyrhyme
Copy link
Contributor Author

Bah, I pressed "Resolve conflicts" in GitHub and it did a git merge

And there's still conflicts :S

wez added a commit that referenced this pull request Feb 4, 2024
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