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

fix: Highlighting and updating of the new console not working well

Browse Source
This commit is contained in:
WerWolv 2023-06-14 10:35:23 +02:00
parent 0e5371b298
commit 90a576c3c7
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/external/imgui/source/TextEditor.cpp vendored
View File

@ -2046,11 +2046,11 @@ void TextEditor::ColorizeInternal() {
auto &startStr = mLanguageDefinition.mCommentStart;
auto &singleStartStr = mLanguageDefinition.mSingleLineComment;
if (singleStartStr.size() > 0 &&
if (!singleStartStr.empty() &&
currentIndex + singleStartStr.size() <= line.size() &&
equals(singleStartStr.begin(), singleStartStr.end(), from, from + singleStartStr.size(), pred)) {
withinSingleLineComment = true;
} else if (!withinSingleLineComment && currentIndex + startStr.size() <= line.size() &&
} else if (!startStr.empty() && !withinSingleLineComment && currentIndex + startStr.size() <= line.size() &&
equals(startStr.begin(), startStr.end(), from, from + startStr.size(), pred)) {
commentStartLine = currentLine;
commentStartIndex = currentIndex;

1
plugins/builtin/include/content/views/view_pattern_editor.hpp
View File

@ -140,6 +140,7 @@ namespace hex::plugin::builtin {
bool m_hasUnevaluatedChanges = false;
TextEditor m_textEditor, m_consoleEditor;
std::atomic<bool> m_consoleNeedsUpdate = false;
std::atomic<bool> m_dangerousFunctionCalled = false;
std::atomic<DangerousFunctionPerms> m_dangerousFunctionsAllowed = DangerousFunctionPerms::Ask;

15
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@ -112,9 +112,9 @@ namespace hex::plugin::builtin {
langDef.mName = "Console Log";
langDef.mCaseSensitive = false;
langDef.mAutoIndentation = false;
langDef.mCommentStart = "\x01";
langDef.mCommentEnd = "\x01";
langDef.mSingleLineComment = "\x01";
langDef.mCommentStart = "";
langDef.mCommentEnd = "";
langDef.mSingleLineComment = "";
initialized = true;
}
@ -298,12 +298,10 @@ namespace hex::plugin::builtin {
}
void ViewPatternEditor::drawConsole(ImVec2 size) {
{
if (this->m_consoleNeedsUpdate) {
std::scoped_lock lock(this->m_logMutex);
if (this->m_consoleEditor.GetTotalLines() == 1 || size_t(this->m_consoleEditor.GetTotalLines()) != this->m_console->size()) {
this->m_consoleEditor.SetTextLines(*this->m_console);
}
this->m_consoleEditor.SetTextLines(*this->m_console);
}
this->m_consoleEditor.Render("##console", size, true);
@ -866,6 +864,7 @@ namespace hex::plugin::builtin {
this->m_textEditor.SetErrorMarkers({});
this->m_console->clear();
this->m_consoleNeedsUpdate = true;
this->m_sectionWindowDrawer.clear();
@ -920,6 +919,7 @@ namespace hex::plugin::builtin {
}
this->m_console->emplace_back(line);
this->m_consoleNeedsUpdate = true;
}
});
@ -935,6 +935,7 @@ namespace hex::plugin::builtin {
this->m_console->emplace_back(
hex::format("I: Evaluation took {}", runtime.getLastRunningTime())
);
this->m_consoleNeedsUpdate = true;
};