Pressing quit checks for close popup, and close popup has scroll bar

This commit is contained in:
Yousef Khadadeh 2026-01-20 18:40:14 +03:00
parent f362f02967
commit 5143557e78

View file

@ -448,7 +448,7 @@ void Toolbar::close_popup_gui() {
}); });
CLAY_AUTO_ID({ CLAY_AUTO_ID({
.layout = { .layout = {
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) }, .sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0, 600) },
.padding = CLAY_PADDING_ALL(io->theme->padding1), .padding = CLAY_PADDING_ALL(io->theme->padding1),
.childGap = io->theme->childGap1, .childGap = io->theme->childGap1,
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP}, .childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP},
@ -461,8 +461,15 @@ void Toolbar::close_popup_gui() {
gui.obstructing_window(); gui.obstructing_window();
gui.push_id("Close single file popup gui"); gui.push_id("Close single file popup gui");
gui.text_label("Files may contain unsaved changes"); gui.text_label("Files may contain unsaved changes");
gui.scroll_bar_area("close file popup gui scroll area", false, [&](float, float, float &) {
CLAY_AUTO_ID({
.layout = {
.childGap = io->theme->childGap1,
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP},
.layoutDirection = CLAY_TOP_TO_BOTTOM
}
}) {
size_t i = 0; size_t i = 0;
gui.push_id("File list");
for(auto& [w, setToSave] : closePopupData.worldsToClose) { for(auto& [w, setToSave] : closePopupData.worldsToClose) {
auto wLock = w.lock(); auto wLock = w.lock();
CLAY_AUTO_ID({ CLAY_AUTO_ID({
@ -493,7 +500,8 @@ void Toolbar::close_popup_gui() {
} }
++i; ++i;
} }
gui.pop_id(); }
});
if(gui.text_button_wide("Save", "Save")) { if(gui.text_button_wide("Save", "Save")) {
for(auto& [w, setToSave] : closePopupData.worldsToClose) { for(auto& [w, setToSave] : closePopupData.worldsToClose) {
auto wLock = w.lock(); auto wLock = w.lock();
@ -726,8 +734,10 @@ void Toolbar::top_toolbar() {
optionsMenuType = ABOUT_MENU; optionsMenuType = ABOUT_MENU;
} }
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
if(gui.text_button_left_transparent("quit button", "Quit")) if(gui.text_button_left_transparent("quit button", "Quit")) {
if(main.app_close_requested())
main.setToQuit = true; main.setToQuit = true;
}
#endif #endif
if(io->mouse.leftClick && !menuPopUpJustOpen) if(io->mouse.leftClick && !menuPopUpJustOpen)
menuPopUpOpen = false; menuPopUpOpen = false;