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

sys: Merge splash screen and ImHex into one application

Browse Source 
This fixes so many issues the previous implementation had, especially on Unix
This commit is contained in:
WerWolv
2021-04-20 21:46:48 +02:00
parent d7811e2c55
commit 1f2fe6b93d
24 changed files with 342 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/views/view_pattern.cpp
View File

@@ -76,7 +76,7 @@ namespace hex {
}
ViewPattern::ViewPattern(std::vector<lang::PatternData*> &patternData) : View("hex.view.pattern.name"), m_patternData(patternData) {
ViewPattern::ViewPattern() : View("hex.view.pattern.name") {
this->m_patternLanguageRuntime = new lang::PatternLanguage();
this->m_textEditor.SetLanguageDefinition(PatternLanguage());
@@ -345,10 +345,10 @@ namespace hex {
}
void ViewPattern::clearPatternData() {
for (auto &data : this->m_patternData)
for (auto &data : SharedData::patternData)
delete data;
this->m_patternData.clear();
SharedData::patternData.clear();
lang::PatternData::resetPalette();
}
@@ -371,7 +371,7 @@ namespace hex {
this->m_console = this->m_patternLanguageRuntime->getConsoleLog();
if (result.has_value()) {
this->m_patternData = std::move(result.value());
SharedData::patternData = std::move(result.value());
View::doLater([]{
EventManager::post<EventPatternChanged>();
});