Undo finalized for layer and bookmark managers even when button is clicked to close menu
This commit is contained in:
parent
176cd1c2d2
commit
e760834592
3 changed files with 9 additions and 2 deletions
|
|
@ -17,6 +17,8 @@ void BookmarkManager::server_init_no_file() {
|
|||
void BookmarkManager::refresh_gui_data() {
|
||||
selectionData = GUIStuff::TreeListing::SelectionData();
|
||||
editing_bookmark_check();
|
||||
oldSelection.clear();
|
||||
editingBookmarkName = std::nullopt;
|
||||
nameToEdit.clear();
|
||||
nameForNew.clear();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ void DrawingProgramLayerManagerGUI::refresh_gui_data() {
|
|||
oldSelection.clear();
|
||||
nameToEdit.clear();
|
||||
nameForNew.clear();
|
||||
editingData = std::nullopt;
|
||||
alphaValToEdit = 0.0f;
|
||||
blendModeValToEdit = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -492,16 +492,20 @@ void Toolbar::top_toolbar() {
|
|||
}
|
||||
}
|
||||
if(gui.svg_icon_button_transparent("Layer Menu Button", "data/icons/layer.svg", layerMenuPopupOpen)) {
|
||||
if(layerMenuPopupOpen)
|
||||
if(layerMenuPopupOpen) {
|
||||
main.world->drawProg.layerMan.listGUI.refresh_gui_data();
|
||||
layerMenuPopupOpen = false;
|
||||
}
|
||||
else {
|
||||
layerMenuPopupOpen = true;
|
||||
layerMenuPopUpJustOpen = true;
|
||||
}
|
||||
}
|
||||
if(gui.svg_icon_button_transparent("Bookmark Menu Button", "data/icons/bookmark.svg", bookmarkMenuPopupOpen)) {
|
||||
if(bookmarkMenuPopupOpen)
|
||||
if(bookmarkMenuPopupOpen) {
|
||||
main.world->bMan.refresh_gui_data();
|
||||
bookmarkMenuPopupOpen = false;
|
||||
}
|
||||
else {
|
||||
bookmarkMenuPopupOpen = true;
|
||||
bookmarkMenuPopUpJustOpen = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue