eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-14 03:39:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix Color dialog ends properly

Browse Source 
Changed multithreading mechanism to use color value from color dialog, avoiding to rely on the testing of future value.
This commit is contained in:
Bruno Herbelin
2024-12-21 19:55:00 +01:00
parent 22d9c41357
commit fc91a74d05
5 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/UserInterfaceManager.cpp
View File

@@ -790,7 +790,7 @@ bool UserInterface::saveOrSaveAs(bool force_versioning)
bool UserInterface::TryClose()
{
// cannot close if a file dialog is pending
if (DialogToolkit::FileDialog::busy() || DialogToolkit::ColorPickerDialog::busy())
if (DialogToolkit::FileDialog::busy() || DialogToolkit::ColorPickerDialog::instance().busy())
return false;
// always stop all recordings and pending actions
@@ -902,7 +902,7 @@ void UserInterface::NewFrame()
}
// overlay to ensure file color dialog is closed after use
if (DialogToolkit::ColorPickerDialog::busy()){
if (DialogToolkit::ColorPickerDialog::instance().busy()){
if (!ImGui::IsPopupOpen("##ColorBusy"))
ImGui::OpenPopup("##ColorBusy");
if (ImGui::BeginPopup("##ColorBusy")) {