Skip to content

Commit

Permalink
Final Update v0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
AMADE128 committed Dec 6, 2021
1 parent 0460d4b commit eebbd5a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Monk Studio/Monk Studio/ModuleEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ bool ModuleEditor::DrawUI()

void ModuleEditor::RemoveFolderPopUp()
{
ImGui::OpenPopup("Remove Folder");
/*ImGui::OpenPopup("Remove Folder");
if (ImGui::BeginPopupModal("Remove Folder"))
{
ImVec2 winpos = { (float)App->window->height / 2, (float)App->window->width / 2 };
Expand All @@ -262,6 +262,7 @@ void ModuleEditor::RemoveFolderPopUp()
}
ImGui::EndPopup();
}
*/
}

void ModuleEditor::CreateFolderPopUp()
Expand Down
3 changes: 2 additions & 1 deletion Monk Studio/Monk Studio/ModuleWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,10 +396,11 @@ void ModuleWindow::RecursiveFileDir(std::vector<std::string>& fileNames, std::ve
{
App->editor->new_folder = true;
}
if (ImGui::MenuItem("Delete"))
/*if (ImGui::MenuItem("Delete"))
{
App->editor->remove_folder = true;
}
*/
ImGui::EndPopup();
}

Expand Down
2 changes: 1 addition & 1 deletion Monk Studio/Project Folder/imgui.ini
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Collapsed=0
DockId=0x0000000C,0

[Window][Create Folder]
Pos=951,491
Pos=952,491
Size=321,83
Collapsed=0

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Hardware: Shows what version of SDL, OpenGl, Glew, and Devil the engine is using
Input: Shows in real time the mouse: Position, Motion, and wheel. Also logs all user inputs.

- Assets:
Displays list of all current loaded fbx, and by right-clicking on them the user can create new folders or delete existing ones. (also opens with Alt + 5)
Displays list of all current loaded fbx, and by right-clicking on them the user can create new folders. (also opens with Alt + 5)

### Help
From help the user can open an ImGui Demo, go to our github, releases and report bugs, as well as a window about with information.
Expand Down

0 comments on commit eebbd5a

Please sign in to comment.