Skip to content

add skipLock option to window creation #110

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add skipLock option to window creation #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/imgui_ui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,10 @@ void mcpelauncher_addmenu(size_t length, MenuEntryABI* entries) {
menuentrieslock.unlock();
}

void mcpelauncher_show_window(const char *title, int isModal, void *user, void (*onClose)(void *user), int count, control *controls) {
activeWindowsLock.lock();
void mcpelauncher_show_window(const char *title, int isModal, void *user, void (*onClose)(void *user), int count, control *controls, bool skipLock) {
if (!skipLock) {
activeWindowsLock.lock();
}
std::vector<WindowControl> subentries(count);
for(int i = 0; i < count; i++) {
subentries[i].type = controls[i].type;
Expand Down Expand Up @@ -267,17 +269,23 @@ void mcpelauncher_show_window(const char *title, int isModal, void *user, void (
.controls = std::move(subentries),
}));
}
activeWindowsLock.unlock();
if (!skipLock) {
activeWindowsLock.unlock();
}
}

void mcpelauncher_close_window(const char *title) {
activeWindowsLock.lock();
void mcpelauncher_close_window(const char *title, bool skipLock) {
if (!skipLock) {
activeWindowsLock.lock();
}
if(auto activeWindow = std::find_if(activeWindows.begin(), activeWindows.end(), [title](auto&& wnd) {
return wnd->title == (title ? title : "Untitled");
}); activeWindow != activeWindows.end()) {
activeWindows.erase(activeWindow);
}
activeWindowsLock.unlock();
if (!skipLock) {
activeWindowsLock.unlock();
}
}

void ImGuiUIInit(GameWindow* window) {
Expand Down
4 changes: 2 additions & 2 deletions src/imgui_ui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ struct control
} textinput;
} data;
};
void mcpelauncher_show_window(const char* title, int isModal, void* user, void(*onClose)(void* user), int count, control* controls);
void mcpelauncher_show_window(const char* title, int isModal, void* user, void(*onClose)(void* user), int count, control* controls, bool skipLock = false);

void mcpelauncher_close_window(const char *title);
void mcpelauncher_close_window(const char *title, bool skipLock = false);
Loading