imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-29 00:10:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: Implement more functionality into splash screen (#223)

Browse Source 
* build: Add libcurl

* build: Stop the whole static linking on Windows mess. There's no use anymore

* sys: Added update detector and moved some startup tasks to splash screen

* sys: Updated ImHex icon

* fix: Settings button on welcome page once again works

* build: Fix build on Linux

* sys: Fixed splash window not searching all paths for resources
This commit is contained in:
WerWolv
2021-04-18 20:24:42 +02:00
committed by GitHub
parent 6fb6de6b64
commit ebbbcafe5c
29 changed files with 3563 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
splash/source/splash_window.cpp
View File

@@ -48,19 +48,17 @@ namespace hex::pre {
this->deinitGLFW();
}
static void drawSplashScreen(ImTextureID splashTexture, u32 width, u32 height, float progress) {
auto drawList = ImGui::GetOverlayDrawList();
drawList->AddImage(splashTexture, ImVec2(0, 0), ImVec2(width, height));
drawList->AddText(ImVec2(20, 120), 0xFFFFFFFF, hex::format("WerWolv 2020 - {0}\n{1} : {2}@{3}", __DATE__ + 7, IMHEX_VERSION, GIT_COMMIT_HASH, GIT_BRANCH).c_str());
drawList->AddRectFilled(ImVec2(0, height - 5), ImVec2(width * progress, height), 0xFFFFFFFF);
}
std::future<bool> WindowSplash::processTasksAsync() {
return std::async(std::launch::async, [this] {
bool status = true;
for (const auto &task : this->m_tasks) {
for (const auto &[name, task] : this->m_tasks) {
{
std::lock_guard guard(this->m_progressMutex);
this->m_currTaskName = name;
}
status = status && task();
{
@@ -76,12 +74,22 @@ namespace hex::pre {
});
}
void WindowSplash::loop() {
auto [splashTexture, splashWidth, splashHeight] = ImGui::LoadImageFromPath((hex::getPath(hex::ImHexPath::Resources)[0] + "/splash.png").c_str());
bool WindowSplash::loop() {
ImTextureID splashTexture;
u32 splashWidth, splashHeight;
for (const auto &path : hex::getPath(hex::ImHexPath::Resources)) {
std::tie(splashTexture, splashWidth, splashHeight) = ImGui::LoadImageFromPath((path + "/splash.png").c_str());
if (splashTexture != nullptr)
break;
}
if (splashTexture == nullptr)
exit(EXIT_FAILURE);
ON_SCOPE_EXIT { ImGui::UnloadImage(splashTexture); };
auto done = processTasksAsync();
while (!glfwWindowShouldClose(this->m_window)) {
@@ -93,7 +101,13 @@ namespace hex::pre {
{
std::lock_guard guard(this->m_progressMutex);
drawSplashScreen(splashTexture, splashWidth, splashHeight, this->m_progress);
auto drawList = ImGui::GetOverlayDrawList();
drawList->AddImage(splashTexture, ImVec2(0, 0), ImVec2(splashWidth, splashHeight));
drawList->AddText(ImVec2(15, 120), ImColor(0xFF, 0xFF, 0xFF, 0xFF), hex::format("WerWolv 2020 - {0}\n{1} : {2}@{3}", &__DATE__[7], IMHEX_VERSION, GIT_BRANCH, GIT_COMMIT_HASH).c_str());
drawList->AddRectFilled(ImVec2(0, splashHeight - 5), ImVec2(splashWidth * this->m_progress, splashHeight), 0xFFFFFFFF);
drawList->AddText(ImVec2(15, splashHeight - 22), ImColor(0xFF, 0xFF, 0xFF, 0xFF), this->m_currTaskName.data());
}
ImGui::Render();
@@ -107,13 +121,11 @@ namespace hex::pre {
glfwSwapBuffers(this->m_window);
if (done.wait_for(0s) == std::future_status::ready) {
if (!done.get()) printf("One or more tasks failed to execute!");
break;
return done.get();
}
}
ImGui::UnloadImage(splashTexture);
return false;
}
void WindowSplash::initGLFW() {
@@ -127,6 +139,7 @@ namespace hex::pre {
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
glfwWindowHint(GLFW_FLOATING, GLFW_TRUE);