Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-12 02:00:52 +01:00
Code Releases Wiki Activity

sys: Clear project context when closing all providers, Display project name in window title (#860)

Browse Source 
* clear project context when closing all providers

* Show project name on window title

* refactor RequestChangeWindowTitle to RequestUpdateWindowTitle

* add spaces
This commit is contained in:
Thomas 2023-01-07 17:31:22 +01:00 committed by GitHub
parent ed831c6fc9
commit ab29303c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libimhex/include/hex/api/event.hpp
View File

@ -126,7 +126,7 @@ namespace hex {
EVENT_DEF(RequestSelectionChange, Region);
EVENT_DEF(RequestAddBookmark, Region, std::string, std::string, color_t);
EVENT_DEF(RequestSetPatternLanguageCode, std::string);
EVENT_DEF(RequestChangeWindowTitle, std::string);
EVENT_DEF(RequestUpdateWindowTitle);
EVENT_DEF(RequestCloseImHex, bool);
EVENT_DEF(RequestRestartImHex);
EVENT_DEF(RequestOpenFile, std::fs::path);

2
lib/libimhex/include/hex/api/project_file_manager.hpp
View File

@ -34,6 +34,8 @@ namespace hex {
static bool store(std::optional<std::fs::path> filePath = std::nullopt);
static bool hasPath();
static void clearPath();
static std::fs::path getPath();
static void registerHandler(const Handler &handler) {
getHandlers().push_back(handler);

10
lib/libimhex/source/api/project_file_manager.cpp
View File

@ -73,7 +73,7 @@ namespace hex {
}
ProjectFile::s_currProjectPath = filePath;
EventManager::post<RequestUpdateWindowTitle>();
return true;
}
@ -124,4 +124,12 @@ namespace hex {
return !ProjectFile::s_currProjectPath.empty();
}
void ProjectFile::clearPath() {
ProjectFile::s_currProjectPath.clear();
}
std::fs::path ProjectFile::getPath() {
return ProjectFile::s_currProjectPath;
}
}

16
main/source/window/window.cpp
View File

@ -115,13 +115,19 @@ namespace hex {
EventManager::post<EventWindowClosing>(this->m_window);
});
EventManager::subscribe<RequestChangeWindowTitle>(this, [this](const std::string &windowTitle) {
EventManager::subscribe<RequestUpdateWindowTitle>(this, [this]() {
std::string title = "ImHex";
if (ImHexApi::Provider::isValid()) {
if (ProjectFile::hasPath()) {
title += " - Project " + hex::limitStringLength(ProjectFile::getPath().stem().string(), 32);
if (ImHexApi::Provider::isDirty())
title += " (*)";
} else if (ImHexApi::Provider::isValid()) {
auto provider = ImHexApi::Provider::get();
if (!windowTitle.empty() && provider != nullptr) {
title += " - " + hex::limitStringLength(windowTitle, 32);
if (provider != nullptr) {
title += " - " + hex::limitStringLength(provider->getName(), 32);
if (provider->isDirty())
title += " (*)";
@ -177,7 +183,7 @@ namespace hex {
Window::~Window() {
EventManager::unsubscribe<EventProviderDeleted>(this);
EventManager::unsubscribe<RequestCloseImHex>(this);
EventManager::unsubscribe<RequestChangeWindowTitle>(this);
EventManager::unsubscribe<RequestUpdateWindowTitle>(this);
EventManager::unsubscribe<EventAbnormalTermination>(this);
EventManager::unsubscribe<RequestOpenPopup>(this);

9
plugins/builtin/source/content/events.cpp
View File

@ -44,17 +44,14 @@ namespace hex::plugin::builtin {
EventManager::subscribe<EventProviderChanged>([](hex::prv::Provider *oldProvider, hex::prv::Provider *newProvider) {
hex::unused(oldProvider);
hex::unused(newProvider);
if (newProvider != nullptr && newProvider->isAvailable()) {
EventManager::post<RequestChangeWindowTitle>(newProvider->getName());
} else {
EventManager::post<RequestChangeWindowTitle>("");
}
EventManager::post<RequestUpdateWindowTitle>();
});
EventManager::subscribe<EventProviderOpened>([](hex::prv::Provider *provider) {
if (provider != nullptr && ImHexApi::Provider::get() == provider)
EventManager::post<RequestChangeWindowTitle>(provider->getName());
EventManager::post<RequestUpdateWindowTitle>();
});
EventManager::subscribe<RequestOpenFile>(openFile);

9
plugins/builtin/source/content/welcome_screen.cpp
View File

@ -500,6 +500,15 @@ namespace hex::plugin::builtin {
}
});
// clear project context if we go back to the welcome screen
EventManager::subscribe<EventProviderChanged>([](hex::prv::Provider *oldProvider, hex::prv::Provider *newProvider) {
hex::unused(oldProvider);
if (newProvider == nullptr) {
ProjectFile::clearPath();
EventManager::post<RequestUpdateWindowTitle>();
}
});
ContentRegistry::Interface::addMenuItem("hex.builtin.menu.file", 1075, [&] {
if (ImGui::BeginMenu("hex.builtin.menu.file.open_recent"_lang, !s_recentProvidersUpdating && !s_recentProviders.empty())) {
// Copy to avoid changing list while iteration