feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BinEditor: Allow selections beyond offset 2^31

Browse Source 
Fixes: QTCREATORBUG-30282
Change-Id: I18c6ee313b07d3e0606b7fc1e661ef6c90e026e9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2024-02-12 12:44:05 +01:00
parent 1726d8a0c8
commit dbc68fe3aa
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/bineditor/bineditorwidget.cpp
View File

@@ -581,13 +581,13 @@ void BinEditorWidget::updateLines()
updateLines(m_cursorPosition, m_cursorPosition);
}
void BinEditorWidget::updateLines(int fromPosition, int toPosition)
void BinEditorWidget::updateLines(qint64 fromPosition, qint64 toPosition)
{
int topLine = verticalScrollBar()->value();
int firstLine = qMin(fromPosition, toPosition) / m_bytesPerLine;
int lastLine = qMax(fromPosition, toPosition) / m_bytesPerLine;
int y = (firstLine - topLine) * m_lineHeight;
int h = (lastLine - firstLine + 1 ) * m_lineHeight;
const qint64 topLine = verticalScrollBar()->value();
const qint64 firstLine = qMin(fromPosition, toPosition) / m_bytesPerLine;
const qint64 lastLine = qMax(fromPosition, toPosition) / m_bytesPerLine;
const int y = (firstLine - topLine) * m_lineHeight;
const int h = (lastLine - firstLine + 1 ) * m_lineHeight;
viewport()->update(0, y, viewport()->width(), h);
}
@@ -800,7 +800,7 @@ void BinEditorWidget::paintEvent(QPaintEvent *e)
int foundPatternAt = findPattern(patternData, patternDataHex, patternOffset, patternOffset, &matchLength);
int selStart, selEnd;
qint64 selStart, selEnd;
if (m_cursorPosition >= m_anchorPosition) {
selStart = m_anchorPosition;
selEnd = m_cursorPosition;
@@ -1006,7 +1006,7 @@ qint64 BinEditorWidget::cursorPosition() const
void BinEditorWidget::setCursorPosition(qint64 pos, MoveMode moveMode)
{
pos = qMin(m_size - 1, qMax(qint64(0), pos));
int oldCursorPosition = m_cursorPosition;
qint64 oldCursorPosition = m_cursorPosition;
m_lowNibble = false;
m_cursorPosition = pos;

2
src/plugins/bineditor/bineditorwidget.h
View File

@@ -198,7 +198,7 @@ private:
bool inTextArea(const QPoint &pos) const;
QRect cursorRect() const;
void updateLines();
void updateLines(int fromPosition, int toPosition);
void updateLines(qint64 fromPosition, qint64 toPosition);
void ensureCursorVisible();
void setBlinkingCursorEnabled(bool enable);