Fix #4156 (OSD stealing mouse clicks from OSC even while hidden), #4612: (OSC responds to mouse hover when behind OSD) #4637
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
svobs
changed the title
uiryuu
requested changes
Dec 26, 2023
| @@ -2265,6 +2262,16 @@ class MainWindowController: PlayerWindowController { | |||
| } | |||
| } | |||
|
|
|||
| private func refreshSeekTimeAndThumnail(from event: NSEvent) { | |||
| let isCoveredByOSD = !osdVisualEffectView.isHidden && isMouseEvent(event, inAnyOf: [osdVisualEffectView]) | |||
There was a problem hiding this comment.
I also found that if the sidebar covers the thumbnail, it will also trigger the thumbnail, and I've confirmed that something like this
let isCoveredBySidebar = !sideBarView.isHidden && isMouseEvent(event, inAnyOf: [sideBarView])
and checking both isCoveredByOSD and isCoveredBySidebar is able to fix this problem
Coeur
reviewed
Dec 28, 2023
iina/MainWindowController.swift
Outdated
| @@ -2265,6 +2262,16 @@ class MainWindowController: PlayerWindowController { | |||
| } | |||
| } | |||
|
|
|||
| private func refreshSeekTimeAndThumnail(from event: NSEvent) { | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
There was a problem hiding this comment.
Pushed another commit which should address feedback, thanks.
svobs
force-pushed
the
pr-fix-floating-osc-click-over-osd
branch
from
b9b8a78
to
1039c9b
Compare
…idebar, + minor cleanup
svobs
force-pushed
the
pr-fix-floating-osc-click-over-osd
branch
from
1039c9b
to
6566561
Compare
|
Thanks! |
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.
Description:
Could not have been a more straightforward fix. When the OSD was hidden, its alpha was set to 0, but
isHiddenwas never set totrue(looks deleted or forgot to include).Update: added a fix for #4612, since it needed the original fix as a prerequisite.