Updated: Fix output-specific images when output reappears #330
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hm, this looks a bit fragile. I would suggest moving this Line 314 in f2298bd to |
|
Would need to add a check to make sure |
When setting an image with `--image <output>:<path>`, the image used to fail to apply if the relevant output appears some time after swaylock executes. Co-authored-by: Alexander Bakker <[email protected]>
alexbakker
force-pushed
the
keep-output-images
branch
from
ff3be92 to
3107120
Compare
|
Alright. How's this? |
emersion
reviewed
Dec 14, 2023
| struct swaylock_surface *surface = data; | ||
| if (!surface->created && surface->state->run_display) { | ||
| create_surface(surface); | ||
| wl_display_roundtrip(surface->state->display); |
There was a problem hiding this comment.
I don't think this is necessary (in fact, I think it's a potential source of bugs), but it was there before so orthogonal to this PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since #155 hasn't been touched in quite a while, I figured I'd take a shot at dragging it across the finish line. The patch has been rebased and modified to use wl_output instead of xdg_output. The remaining feedback from the previous pull request has also been addressed.