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

fix: fixed console selections while improving code clarity.

Browse Source 
The function SetSelection() in the text editor is used as its name implies to set the part of text that will be shown highlighted as a selection. It has two parameter for the selection start and end.

Strangely it also uses a third argument to choose one of 3 selection modes (line, word and normal). This is strange because it seems that if one wanted to select a line one would simply choose the line start and end as the selection values. 

Furthermore using selection mode creates a bug when the word boundaries are advanced twice during a single word left or right selection and a second bug when SetSelection is used to set the cursor when the window acquires focus breaking selections in the console editor.

This PR simply eliminates the extraneous argument to SetSelection() ensuring that any problems related to it are fixed once and for all improving code readability by removing the use of inconsistent argument values to cover for the functionality  duplication design flaw.
This commit is contained in:
paxcut
2025-04-30 22:08:23 -07:00
committed by GitHub
parent f6def74b29
commit 78ad0d2592
2 changed files with 20 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,12 +44,6 @@ public:
Max
};
enum class SelectionMode
{
Normal,
Word,
Line
};
struct Breakpoint
{
@@ -398,7 +392,7 @@ public:
void SetSelectionStart(const Coordinates& aPosition);
void SetSelectionEnd(const Coordinates& aPosition);
void SetSelection(const Coordinates& aStart, const Coordinates& aEnd, SelectionMode aMode = SelectionMode::Normal);
void SetSelection(const Coordinates& aStart, const Coordinates& aEnd);
Selection GetSelection() const;
void SelectWordUnderCursor();
void SelectAll();
@@ -608,7 +602,6 @@ private:
bool mCursorPositionChanged = false;
bool mBreakPointsChanged = false;
int mColorRangeMin = 0, mColorRangeMax = 0;
SelectionMode mSelectionMode = SelectionMode::Normal;
bool mHandleKeyboardInputs = true;
bool mHandleMouseInputs = true;
bool mIgnoreImGuiChild = false;

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

@@ -780,9 +780,10 @@ void TextEditor::HandleMouseInputs() {
if (tripleClick) {
if (!ctrl) {
mState.mCursorPosition = mInteractiveStart = mInteractiveEnd = ScreenPosToCoordinates(ImGui::GetMousePos());
mSelectionMode = SelectionMode::Line;
SetSelection(mInteractiveStart, mInteractiveEnd, mSelectionMode);
mState.mCursorPosition = ScreenPosToCoordinates(ImGui::GetMousePos());
auto line = mState.mCursorPosition.mLine;
mState.mSelectionStart = Coordinates(line, 0);
mState.mSelectionEnd = Coordinates(line, GetLineMaxColumn(line));
}
mLastClick = -1.0f;
@@ -795,12 +796,9 @@ void TextEditor::HandleMouseInputs() {
else if (doubleClick) {
if (!ctrl) {
mState.mCursorPosition = mInteractiveStart = mInteractiveEnd = ScreenPosToCoordinates(ImGui::GetMousePos());
if (mSelectionMode == SelectionMode::Line)
mSelectionMode = SelectionMode::Normal;
else
mSelectionMode = SelectionMode::Word;
SetSelection(mInteractiveStart, mInteractiveEnd, mSelectionMode);
mState.mCursorPosition = ScreenPosToCoordinates(ImGui::GetMousePos());
mState.mSelectionStart = FindWordStart(mState.mCursorPosition);
mState.mSelectionEnd = FindWordEnd(mState.mCursorPosition);
}
mLastClick = (float)ImGui::GetTime();
@@ -813,15 +811,15 @@ void TextEditor::HandleMouseInputs() {
else if (click) {
if (ctrl) {
mState.mCursorPosition = mInteractiveStart = mInteractiveEnd = ScreenPosToCoordinates(ImGui::GetMousePos());
mSelectionMode = SelectionMode::Word;
SelectWordUnderCursor();
} else if (shift) {
mSelectionMode = SelectionMode::Normal;
mInteractiveEnd = ScreenPosToCoordinates(ImGui::GetMousePos());
mState.mCursorPosition = mInteractiveEnd;
SetSelection(mInteractiveStart, mInteractiveEnd);
} else {
mState.mCursorPosition = mInteractiveStart = mInteractiveEnd = ScreenPosToCoordinates(ImGui::GetMousePos());
mSelectionMode = SelectionMode::Normal;
SetSelection(mInteractiveStart, mInteractiveEnd);
}
SetSelection(mInteractiveStart, mInteractiveEnd, mSelectionMode);
ResetCursorBlinkTime();
EnsureCursorVisible();
@@ -831,8 +829,7 @@ void TextEditor::HandleMouseInputs() {
if (!HasSelection() || mState.mSelectionStart > cursorPosition || cursorPosition > mState.mSelectionEnd) {
mState.mCursorPosition = mInteractiveStart = mInteractiveEnd = cursorPosition;
mSelectionMode = SelectionMode::Normal;
SetSelection(mInteractiveStart, mInteractiveEnd, mSelectionMode);
SetSelection(mInteractiveStart, mInteractiveEnd);
}
ResetCursorBlinkTime();
mRaiseContextMenu = true;
@@ -841,7 +838,7 @@ void TextEditor::HandleMouseInputs() {
else if (ImGui::IsMouseDragging(0) && ImGui::IsMouseDown(0)) {
io.WantCaptureMouse = true;
mState.mCursorPosition = mInteractiveEnd = ScreenPosToCoordinates(ImGui::GetMousePos());
SetSelection(mInteractiveStart, mInteractiveEnd, mSelectionMode);
SetSelection(mInteractiveStart, mInteractiveEnd);
resetBlinking=true;
}
if (resetBlinking)
@@ -865,9 +862,7 @@ inline void TextUnformattedColoredAt(const ImVec2 &pos, const ImU32 &color, cons
}
void TextEditor::SetFocus() {
mState.mCursorPosition = mInteractiveStart = mInteractiveEnd = mFocusAtCoords;
mSelectionMode = SelectionMode::Normal;
SetSelection(mInteractiveStart, mInteractiveEnd, mSelectionMode);
mState.mCursorPosition = mFocusAtCoords;
ResetCursorBlinkTime();
EnsureCursorVisible();
if (!this->mReadOnly) {
@@ -1566,7 +1561,7 @@ void TextEditor::SetSelectionEnd(const Coordinates &aPosition) {
std::swap(mState.mSelectionStart, mState.mSelectionEnd);
}
void TextEditor::SetSelection(const Coordinates &aStart, const Coordinates &aEnd, SelectionMode aMode) {
void TextEditor::SetSelection(const Coordinates &aStart, const Coordinates &aEnd) {
auto oldSelStart = mState.mSelectionStart;
auto oldSelEnd = mState.mSelectionEnd;
@@ -1575,28 +1570,6 @@ void TextEditor::SetSelection(const Coordinates &aStart, const Coordinates &aEnd
if (mState.mSelectionStart > mState.mSelectionEnd)
std::swap(mState.mSelectionStart, mState.mSelectionEnd);
switch (aMode) {
case TextEditor::SelectionMode::Normal:
break;
case TextEditor::SelectionMode::Word:
{
mState.mSelectionStart = FindWordStart(mState.mSelectionStart);
if (!IsOnWordBoundary(mState.mSelectionEnd))
mState.mSelectionEnd = FindWordEnd(FindWordStart(mState.mSelectionEnd));
break;
}
case TextEditor::SelectionMode::Line:
{
const auto lineNo = mState.mSelectionEnd.mLine;
const auto lineSize = (size_t)lineNo < mLines.size() ? mLines[lineNo].size() : 0;
mState.mSelectionStart = Coordinates(mState.mSelectionStart.mLine, 0);
mState.mSelectionEnd = Coordinates(lineNo, GetLineMaxColumn(lineNo));
break;
}
default:
break;
}
if (mState.mSelectionStart != oldSelStart ||
mState.mSelectionEnd != oldSelEnd)
mCursorPositionChanged = true;
@@ -1790,7 +1763,7 @@ void TextEditor::MoveLeft(int aAmount, bool aSelect, bool aWordMode) {
}
} else
mInteractiveStart = mInteractiveEnd = mState.mCursorPosition;
SetSelection(mInteractiveStart, mInteractiveEnd, SelectionMode::Normal);
SetSelection(mInteractiveStart, mInteractiveEnd);
EnsureCursorVisible();
}
@@ -1846,7 +1819,7 @@ void TextEditor::MoveRight(int aAmount, bool aSelect, bool aWordMode) {
}
} else
mInteractiveStart = mInteractiveEnd = mState.mCursorPosition;
SetSelection(mInteractiveStart, mInteractiveEnd, SelectionMode::Normal);
SetSelection(mInteractiveStart, mInteractiveEnd);
EnsureCursorVisible();
}
@@ -2065,8 +2038,8 @@ void TextEditor::Backspace() {
}
void TextEditor::SelectWordUnderCursor() {
auto c = GetCursorPosition();
SetSelection(FindWordStart(c), FindWordEnd(c));
auto wordStart = FindWordStart(GetCursorPosition());
SetSelection(wordStart,FindWordEnd(wordStart));
}
void TextEditor::SelectAll() {