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

feat: Added goto line popup to text editors (#1984)

Browse Source 
Since the popup is fairly small I opted for a straight addition parallel
to the find/replace. To make code more clear the functions that create
each popup were coalesced and made their interface simpler. That forced
a reorganization of the data processing which translates to a larger
number of changes than usual. Most of those changes are just moving some
action from one function to another.

The old method to identify popups using the size and position of the
window was dropped in favor of one based on child windows and using
their names for a much easier and robust identification.

Added specialized functions to text editor to jump to a line or to given
coordinates with a simple interface that simplifies older code that
performed the same task.

Because this PR modifies heavily the same code as the previous PR (1983)
it is also included here to make merging easier.

---------

Co-authored-by: Nik <werwolv98@gmail.com>
This commit is contained in:
paxcut
2024-12-14 08:50:45 -07:00
committed by GitHub
parent 093310a9e5
commit 8d123da847
5 changed files with 245 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/third_party/imgui/ColorTextEditor/include/TextEditor.h vendored
View File

@@ -321,7 +321,6 @@ public:
return this;
}
class FindReplaceHandler;
public:
@@ -334,6 +333,10 @@ public:
FindReplaceHandler *GetFindReplaceHandler() { return &mFindReplaceHandler; }
int GetTotalLines() const { return (int)mLines.size(); }
bool IsOverwrite() const { return mOverwrite; }
void SetTopMarginChanged(int newMargin) {
mNewTopMargin = newMargin;
mTopMarginChanged = true;
}
void setFocusAtCoords(const Coordinates &coords) {
mFocusAtCoords = coords;
mUpdateFocus = true;
@@ -576,6 +579,8 @@ private:
int mUndoIndex;
bool mScrollToBottom;
float mTopMargin;
float mNewTopMargin;
bool mTopMarginChanged=false;
int mTabSize;
bool mOverwrite;

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

@@ -1129,63 +1129,43 @@ void TextEditor::Render() {
EnsureCursorVisible();
mScrollToCursor = false;
}
ImGuiPopupFlags_ popup_flags = ImGuiPopupFlags_None;
ImGuiContext& g = *GImGui;
auto oldTopMargin = mTopMargin;
auto popupStack = g.OpenPopupStack;
if (popupStack.Size > 0) {
for (int n = 0; n < popupStack.Size; n++){
if (auto window = popupStack[n].Window; window != nullptr) {
if (window->Size.x == mFindReplaceHandler.GetFindWindowSize().x &&
window->Size.y == mFindReplaceHandler.GetFindWindowSize().y &&
window->Pos.x == mFindReplaceHandler.GetFindWindowPos().x &&
window->Pos.y == mFindReplaceHandler.GetFindWindowPos().y) {
mTopMargin = mFindReplaceHandler.GetFindWindowSize().y;
}
}
}
} else {
mTopMargin = 0;
}
if (mTopMargin != oldTopMargin) {
if (oldTopMargin == 0)
if (mTopMarginChanged) {
mTopMarginChanged = false;
if (mTopMargin == 0)
m_savedScrollY = ImGui::GetScrollY();
auto window = ImGui::GetCurrentWindow();
auto maxScroll = window->ScrollMax.y;
if (maxScroll > 0) {
float lineCount;
float pixelCount;
if (mTopMargin > oldTopMargin) {
pixelCount = mTopMargin - oldTopMargin;
if (mNewTopMargin > mTopMargin) {
pixelCount = mNewTopMargin - mTopMargin;
lineCount = pixelCount / mCharAdvance.y;
} else if (mTopMargin > 0) {
pixelCount = oldTopMargin - mTopMargin;
} else if (mNewTopMargin > 0) {
pixelCount = mTopMargin - mNewTopMargin;
lineCount = pixelCount / mCharAdvance.y;
} else {
pixelCount = oldTopMargin;
pixelCount = mTopMargin;
lineCount = std::round(m_linesAdded);
}
auto state = mState;
auto oldScrollY = ImGui::GetScrollY();
int lineCountInt;
if (mTopMargin > oldTopMargin) {
if (mNewTopMargin > mTopMargin) {
lineCountInt = std::round(lineCount + m_linesAdded - std::floor(m_linesAdded));
} else
lineCountInt = std::round(lineCount);
for (int i = 0; i < lineCountInt; i++) {
if (mTopMargin > oldTopMargin)
if (mNewTopMargin > mTopMargin)
mLines.insert(mLines.begin() + mLines.size(), Line());
else
mLines.erase(mLines.begin() + mLines.size() - 1);
}
if (mTopMargin > oldTopMargin) {
if (mNewTopMargin > mTopMargin) {
m_linesAdded += lineCount;
m_pixelsAdded += pixelCount;
} else if (mTopMargin > 0) {
} else if (mNewTopMargin > 0) {
m_linesAdded -= lineCount;
m_pixelsAdded -= pixelCount;
} else {
@@ -1193,9 +1173,9 @@ void TextEditor::Render() {
m_pixelsAdded = 0;
}
if (oldScrollY + pixelCount < maxScroll) {
if (mTopMargin > oldTopMargin)
if (mNewTopMargin > mTopMargin)
m_shiftedScrollY = oldScrollY + pixelCount;
else if (mTopMargin > 0)
else if (mNewTopMargin > 0)
m_shiftedScrollY = oldScrollY - pixelCount;
else if (ImGui::GetScrollY() == m_shiftedScrollY)
m_shiftedScrollY = m_savedScrollY;
@@ -1203,9 +1183,10 @@ void TextEditor::Render() {
m_shiftedScrollY = ImGui::GetScrollY() - pixelCount;
ImGui::SetScrollY(m_shiftedScrollY);
} else {
if (mTopMargin > oldTopMargin)
if (mNewTopMargin > mTopMargin)
mScrollToBottom = true;
}
mTopMargin = mNewTopMargin;
mState = state;
}
}
@@ -1600,6 +1581,7 @@ void TextEditor::DeleteSelection() {
void TextEditor::JumpToLine(int line) {
auto newPos = Coordinates(line, 0);
JumpToCoords(newPos);
setFocusAtCoords(newPos);
}
@@ -1607,6 +1589,7 @@ void TextEditor::JumpToCoords(const Coordinates &aNewPos) {
SetSelection(aNewPos, aNewPos);
SetCursorPosition(aNewPos);
EnsureCursorVisible();
setFocusAtCoords(aNewPos);
}