Skip to content
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

Update Dear ImGUI to 1.90.9 #421

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Update Dear ImGUI to 1.90.9 #421

merged 1 commit into from
Jul 19, 2024

Conversation

mlauss2
Copy link
Contributor

@mlauss2 mlauss2 commented Jul 15, 2024

  • Update ImGUI to 1.90.9
  • export the custom TFE widgets to a separate source file to make imgui updates simpler
  • Fix up the tree to accomodate all ImGUI interface changes

Main motivation is

  • sometime after 1.72 in the tfe tree, imgui dropped GLEW in favour of a built-in GL loader
  • I'd like to get rid of GLEW use in TFE
  • I'd like to replace portable-file-dialogs with ImGuiFileDialog (which needs a newer ImGui than what is in-tree)

Settings pages and Editor (at least the parts of the editor that I'm smart enough to use :) ) all work fine.

This supersedes #418 and I'll add another PR if @luciusDXL is fine with this one.

@luciusDXL
Copy link
Owner

Looks good, I will patch it in after the next release.

- Update ImGUI to 1.90.9 17-jul-2024
- export the custom TFE widgets to a separate source file
- Fix up all ImGUI interface changes

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
@mlauss2
Copy link
Contributor Author

mlauss2 commented Jul 17, 2024

I went over the patch once again, the Editor, esp. the Modal Popups should be working again, and rebased it on top of master.

This version of ImGui has problems(?) with Modal Popups that you also want to have a close button on.
The popup isn't rendered since it's not the topmost in the popup stack and the variable to track the close button is immediately set to false, hiding the popup in the next frame (where it finally IS the topmost).

So I dropped this parameter from every Modal Popup and instead added a "Close" Button at the bottom.

@luciusDXL
Copy link
Owner

luciusDXL commented Jul 18, 2024

I went over the patch once again, the Editor, esp. the Modal Popups should be working again, and rebased it on top of master.

This version of ImGui has problems(?) with Modal Popups that you also want to have a close button on. The popup isn't rendered since it's not the topmost in the popup stack and the variable to track the close button is immediately set to false, hiding the popup in the next frame (where it finally IS the topmost).

So I dropped this parameter from every Modal Popup and instead added a "Close" Button at the bottom.

Annoying but good to know. I will merge this in before moving on further with the editor. My plan, originally, was to just stick with the version of ImGui so I could modify it to further suite the project - but this makes sense to remove GLEW and the file dialogs (mostly for Linux, but we should be consistent between platforms where possible).

@luciusDXL luciusDXL merged commit 73e9b91 into luciusDXL:master Jul 19, 2024
1 check passed
@luciusDXL
Copy link
Owner

The PR was merged in. I have been fixing up Editor issues before pulling in the File dialog change as well.

@mlauss2
Copy link
Contributor Author

mlauss2 commented Jul 19, 2024

Thanks for fixing the Editor!

@luciusDXL
Copy link
Owner

luciusDXL commented Jul 19, 2024

Thanks for fixing the Editor!

The Editor is already pretty complex, so I'm not surprised there were issues with the upgrade. I also fixed some non-imGUI related issues I found as well (my own bugs) so it was a good idea to go through all of the UI anyway.

@mlauss2 mlauss2 deleted the imgui1909 branch July 22, 2024 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants