Fixes & improvements to Settings > UI > OSC toolbar preview & drag/drop #4165
Conversation
This file contains hidden or 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
0195243 to
a6ac95e
Compare
a6ac95e to
28fc4ee
Compare
|
Updated to resolve conflicts |
0e036ca to
935f616
Compare
935f616 to
6c69507
Compare
|
Rebased and fixed conflicts, improved layout further, improved commit message. |
lhc70000
reviewed
Jul 7, 2024
Details: • Fix oversized Settings icon • Fix incorrect color of dragged item in Dark Mode • Improve drag start animation & add "poof" animation for items dragged out of toolbar • Modify layout so that toolbar icons of any size above 8x can be used in the future
6c69507 to
a9f741b
Compare
|
@svobs This PR causes a bug where the volume control and the toolbar buttons are not shown in the floating OSC. It seems like a constraint issue, but I failed to find out the root cause. |
|
Will investigate tonight
…On Mon, Jul 8, 2024 at 08:11 Yuze Jiang ***@***.***> wrote:
@svobs <https://github.com/svobs> This PR causes a bug where the volume
control and the toolbar buttons are not shown in the floating OSC.
image.png (view on web)
<https://github.com/iina/iina/assets/20237141/0c4f4be7-2740-4b31-be62-7ee7e5a02758>
It seems like a constraint issue, but I failed to find out the root cause.
—
Reply to this email directly, view it on GitHub
<#4165 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAQ4PN7LWYE65HBOXR7UTH3ZLKT3XAVCNFSM6AAAAABJVGW4NWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMJUGQYDEMZRGM>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
I've already found the reason, can fix it if you don't mind. |
|
Don't mind at all! Please go ahead 👍
…On Mon, Jul 8, 2024 at 14:59 Hechen Li ***@***.***> wrote:
I've already found the reason, can fix it if you don't mind.
—
Reply to this email directly, view it on GitHub
<#4165 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAQ4PN2JARYB3S2M6CSH5HLZLMDUDAVCNFSM6AAAAABJVGW4NWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMJVGQYTSNRWGU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
lhc70000
added a commit
that referenced
this pull request
Jul 8, 2024
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.
Before:
OSC-DragAndDrop-Old.mp4
After:
OSC-DragAndDrop-New.mp4
Description:
Note: requires #4107 to be merged first.
The
settingstoolbar icon (looks more like a chat bubble to me) comes from the MacOS system icons, whereas all the other OSC toolbar icons are built into IINA. It looks like probably when Apple changed its icon, its displayed size got messed up in IINA. This fix started from an attempt to fix that, which was surprisingly challenging because I wanted to avoid hard-coding an icon size. Along the way I added some more improvements, detailed below.The
settingstoolbar icon is drawn in 6 different places:Only the 1st location was the correct size; the others were too big. It turns out that the Player window was drawing it inside of a button, which fixed its size; the others were just using naked
NSImages.My fix was to replace the naked images with "dead" buttons (disabled but not grayed out visually), which guarantees that the drawing will be the same.
settingstoolbar icon so it matches the other icons.