Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-30 18:34:29 +01:00
Code Releases Wiki Activity

fix: Text cursor not moving to the correct location with ctrl+c -> ctrl+v (#1951)

Browse Source 
This code fixes issue #1950 This PR depends on PR [#27
](https://github.com/WerWolv/libwolv/pull/27) on libwolv repo


### Problem description
See description of the problem on the issue linked above

### Implementation description
The code in the PR uses function added to the libwolv repository to
remove tabs if they exist on the provider. Additionally, any pasted tab
on the pattern editor will be translated to spaces automatically. This
code was tested successfully using the pattern posted in the issue.
This commit is contained in:
paxcut 2024-11-24 03:31:06 -07:00 committed by GitHub
parent 6464377a89
commit 4333b8c351
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp vendored
View File

@ -247,6 +247,18 @@ int TextEditor::InsertTextAt(Coordinates & /* inout */ aWhere, const char *aValu
if (*aValue == '\r') {
// skip
++aValue;
} else if (*aValue == '\t') {
auto &line = mLines[aWhere.mLine];
auto c = GetCharacterColumn(aWhere.mLine, cindex);
auto r = c % mTabSize;
auto d = mTabSize - r;
auto i = d;
while (i-- > 0)
line.insert(line.begin() + cindex++, Glyph(' ', PaletteIndex::Default));
cindex += d;
aWhere.mColumn += d;
aValue++;
} else if (*aValue == '\n') {
if (cindex < (int)mLines[aWhere.mLine].size()) {
auto &newLine = InsertLine(aWhere.mLine + 1);

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

@ -73,6 +73,8 @@ namespace hex::plugin::builtin {
}
public:
std::string preprocessText(const std::string &code);
struct VirtualFile {
std::fs::path path;
std::vector<u8> data;

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

@ -1662,7 +1662,7 @@ namespace hex::plugin::builtin {
void ViewPatternEditor::loadPatternFile(const std::fs::path &path, prv::Provider *provider) {
wolv::io::File file(path, wolv::io::File::Mode::Read);
if (file.isValid()) {
auto code = file.readString();
auto code = preprocessText(file.readString());
this->evaluatePattern(code, provider);
m_textEditor.SetText(code);
@ -1826,6 +1826,15 @@ namespace hex::plugin::builtin {
});
}
std::string ViewPatternEditor::preprocessText(const std::string &code) {
std::string result = wolv::util::replaceStrings(code, "\r\n", "\n");
result = wolv::util::replaceStrings(result, "\r", "\n");
result = wolv::util::replaceTabsWithSpaces(result, 4);
while (result.ends_with('\n'))
result.pop_back();
return result;
}
void ViewPatternEditor::registerEvents() {
RequestPatternEditorSelectionChange::subscribe(this, [this](u32 line, u32 column) {
if (line == 0)
@ -1849,8 +1858,9 @@ namespace hex::plugin::builtin {
});
RequestSetPatternLanguageCode::subscribe(this, [this](const std::string &code) {
m_textEditor.SetText(code);
m_sourceCode.set(ImHexApi::Provider::get(), code);
const std::string preprocessed = preprocessText(code);
m_textEditor.SetText(preprocessed);
m_sourceCode.set(ImHexApi::Provider::get(), preprocessed);
m_hasUnevaluatedChanges = true;
});
@ -2109,7 +2119,7 @@ namespace hex::plugin::builtin {
.basePath = "pattern_source_code.hexpat",
.required = false,
.load = [this](prv::Provider *provider, const std::fs::path &basePath, const Tar &tar) {
const auto sourceCode = tar.readString(basePath);
const auto sourceCode = preprocessText(tar.readString(basePath));
m_sourceCode.set(provider, sourceCode);