-
Notifications
You must be signed in to change notification settings - Fork 24
Marker / Effects search #115
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
base: main
Are you sure you want to change the base?
Conversation
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
|
@ThomasWilshaw can you resolve the conflicts on this one? Looks like a great change. |
|
I'll try and have a look today, it looks like the conflicts are fairly small. It's been a while since I wrote this so I'll have ot refresh my understanding of it and I'd really appreciate a review, there may be better/cleaner approaches to this. |
|
Merge conflicts fixed but I think I need to make sure it's all playing nicely with tabs and I'm not sure if I'll have time to do that today. |
timlehr
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had a look just now and noticed a couple of things:
- the code indeed segfaults with 11 when multiple tabs are open, the marker inspector is visible and we switch tabs
- add some more details on how to use the text filter
Very nice addition otherwise. Thank you so much 👏
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
|
That should be the crash fixed, I had to change the filter state info to be stored per tab. I need to do this for the Effects filter too if you are happy with the approach? R.e. documenting the usage. ImGui's text filters are not a standard widget (as far as I can tell) so the normal tooltip approach doesn't work. Given it's quite a chunk of text anyway I've added it as a collapsable panel under the filter box. Does that work from a design/UX point of view? |
Signed-off-by: Thomas Wilshaw <[email protected]>
|
Awesome! I just played around with it and it seems to work great now. I am personally fine with the usage collapse section since it's collapsed by default and doesn't take much space. |
Signed-off-by: Thomas Wilshaw <[email protected]>
|
Haha sorry I pushed this and then saw your message. This last commit moves the Effects search stuff to the tab data an should be working. It was half done already and works exactly the same as the Marker code so it's probably okay to keep in this PR? I'm happy to remove the commit if not though :) |
|
Also that last commit did fix a bug with the Marker filter checkboxes, they weren't saving their state per tab. Sorry that was probably too many changes in one commit. |
|
Just gave it another look, works great. I don't see a problem combining this, given the similarity of the code. Thanks so much! For @jminor reference, here is how it looks like on the Effects tab.
|
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
|
@jminor I've moved the tooltip to a (?) symbol as requested. Do you think we need the label "Filter" next to the text box?
|
Signed-off-by: Thomas Wilshaw <[email protected]>
…e need to redraw things Signed-off-by: Thomas Wilshaw <[email protected]>
…reload flags Signed-off-by: Thomas Wilshaw <[email protected]>
…owed. Use ## instead Signed-off-by: Thomas Wilshaw <[email protected]>
|
I think that should be both things fixed. I updated the filter logic and split it into seperate functions (one for Markers and another for Effects). I also added a These changes introduced a random bug which I have also fixed so I can test things. An empty string was being used as a label, however this is not allowed in DearImGui as the stack uses widget item names as keys. The correct way to set an empty label is to use |
Signed-off-by: Thomas Wilshaw <[email protected]>
|
Sorry for the bump but I wondered if you have had a chance to look at this @jminor ? |
|
I just re-tested. I still see a crash when I delete a clip that holds a marker. Otherwise this looks great. Repro steps:
Stack trace:
|
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
Signed-off-by: Thomas Wilshaw <[email protected]>
|
Thanks and sorry I missed that. The latest commits should fix that crash as well as ensuring both JSON edits and adding markers cause the lists to update correctly. I'm not quite sure why all the checks seem to be failing. I notice there's been a dependancy update, do I need to rebase this PR to make that all work again? |
|
Actually looking at the auto PRs from dependabot it seems all the actions are failing since the minzip-ng update |






Adds filtering to marker and effect lists. I also had a go at saving the generated list of markers to save have to recalculate it every frame. It does improve performance but there may be a btter way to do it. If you think it's worth doing I can add the same to the effects list to.
Fixes #114