这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@MrStevns
Copy link
Member

No description provided.

@MrStevns
Copy link
Member Author

Hmm odd.. the tests work when i run it on my intel mac and use Qt 6. though i'm still on Monterey...

@MrStevns MrStevns force-pushed the fix-close-button-reposition-frame-dialog branch from 17ec409 to b048866 Compare August 30, 2025 09:15
@scribblemaniac
Copy link
Member

Looks like it could be a similar issue to one I debugged last year caused by certain directories in the data dir path being symlinked in macOS. You should look at validateDataPath in util.cpp for how to properly compare directories. From what I remember, comparisons should be with Qt objects (QDir, QFile, etc.), but those objects need to be initialized with the canonical path.

@MrStevns
Copy link
Member Author

MrStevns commented Aug 30, 2025

Hmm yes that seems to be the case. I figured that out a few moments ago, thanks :D

It's a bit difficult to debug when it works on my machine though.. the strange thing is that the layer_bitmap test works while the layer_sound fails.

I'll look deeper into that function.

@MrStevns
Copy link
Member Author

I decided to use validateDataPath for the comparison rather than QDir.filepath, so the paths are resolved correctly.

It fixes the tests... but is it correct?

Alternatively I could have done QDir(frame->fileName()) == QDir(dataDir.filePath(...)).canonicalPath()

@scribblemaniac scribblemaniac added the 🔹 Minor PR (only one reviewer required) label Sep 16, 2025
@MrStevns MrStevns force-pushed the fix-close-button-reposition-frame-dialog branch from 8b4c8b7 to ae4f06b Compare September 20, 2025 08:30
@MrStevns
Copy link
Member Author

I've reverted the test changes again as a better fix is provided by #1932

@chchwy chchwy added this to the 0.7.1 milestone Sep 22, 2025
@chchwy chchwy force-pushed the fix-close-button-reposition-frame-dialog branch from ae4f06b to 455b1de Compare September 22, 2025 14:54
@github-project-automation github-project-automation bot moved this from Needs Review to Approved in Pull Request Priority Sep 25, 2025
@chchwy
Copy link
Member

chchwy commented Sep 25, 2025

Thanks for catching this!

@chchwy chchwy merged commit b8f8672 into pencil2d:release/0.7.1 Sep 25, 2025
7 of 8 checks passed
@github-project-automation github-project-automation bot moved this from Approved to Merged in Pull Request Priority Sep 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🔹 Minor PR (only one reviewer required)

Projects

Development

Successfully merging this pull request may close these issues.

3 participants