Skip to content

fix two Shortcuts with 'Alt + P/N' and 'Ctrl+M' #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 2 commits into from
Jan 25, 2024
Merged

fix two Shortcuts with 'Alt + P/N' and 'Ctrl+M' #270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4068a69
fix: Shortcut 'Ctrl + M cursor' move to row indentation not implemented
lJxDabab Jan 18, 2024
fbc4b5c
fix: Shortcuts Alt + P / N match the help
lJxDabab Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 17 additions & 36 deletions src/editor/dtextedit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ void TextEdit::forwardPair()
setTextCursor(removeSelectionCursor);

// Start search.
if (find(QRegExp("[\"'>)}]"))) {
if (find(QRegExp("[\]>)}]"))) {
int findPos = textCursor().position();

QTextCursor cursor = textCursor();
Expand Down Expand Up @@ -792,7 +792,7 @@ void TextEdit::backwardPair()
QTextDocument::FindFlags options;
options |= QTextDocument::FindBackward;

if (find(QRegExp("[\"'<({]"), options)) {
if (find(QRegExp("[\[<({]"), options)) {
QTextCursor cursor = textCursor();
auto moveMode = m_cursorMark ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor;

Expand Down Expand Up @@ -882,48 +882,31 @@ void TextEdit::moveToLineIndentation()
{
// Init cursor and move type.
QTextCursor cursor = textCursor();
auto moveMode = m_cursorMark ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor;

// Get line start position.
cursor.movePosition(QTextCursor::StartOfBlock, moveMode);
cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
int startColumn = cursor.columnNumber();

// Get line end position.
cursor.movePosition(QTextCursor::EndOfBlock, moveMode);
cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::MoveAnchor);
int endColumn = cursor.columnNumber();

// Move to line start first.
cursor.movePosition(QTextCursor::StartOfBlock, moveMode);
int nStartPos = cursor.position();

if (nStartPos - 1 < 0) {
nStartPos = 0;
//cursor.setPosition(nStartPos, QTextCursor::MoveAnchor);
cursor.setPosition(nStartPos + 1, moveMode);
} else {
cursor.setPosition(nStartPos - 1, moveMode);
cursor.setPosition(nStartPos, QTextCursor::KeepAnchor);
}

//cursor.movePosition(QTextCursor::PreviousCharacter,QTextCursor::KeepAnchor);
// Move to first non-blank char of line.
// Move the cursor to line start first while keep the anchor to end of block.
cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
int column = startColumn;
while (column < endColumn) {
while (column < endColumn)
{
QChar currentChar = *cursor.selection().toPlainText().data();
//QChar currentChar = toPlainText().at(std::max(cursor.position() - 1, 0));

if (!currentChar.isSpace()) {
//cursor.setPosition(cursor.position(), QTextCursor::MoveAnchor);
cursor.setPosition(cursor.position() - 1, moveMode);
if (!currentChar.isSpace())
{
//stop and reset anchor while be at row indentation.
cursor.setPosition(cursor.position(), QTextCursor::MoveAnchor);
break;
} else {
//cursor.setPosition(cursor.position(), QTextCursor::MoveAnchor);
cursor.setPosition(cursor.position() + 1, moveMode);
}

else
{
//while including 'space',just move ahead.
cursor.setPosition(cursor.position() + 1, QTextCursor::KeepAnchor);
}
column++;
}

cursor.clearSelection();
setTextCursor(cursor);
}
Expand Down Expand Up @@ -3654,7 +3637,6 @@ void TextEdit::setMark()
{
bool currentMark = m_cursorMark;
bool markCursorChanged = false;

if (m_cursorMark) {
if (textCursor().hasSelection()) {
markCursorChanged = true;
Expand Down Expand Up @@ -6793,7 +6775,6 @@ void TextEdit::keyPressEvent(QKeyEvent *e)
{
Qt::KeyboardModifiers modifiers = e->modifiers();
QString key = Utils::getKeyshortcut(e);

//没有修改键　插入文件
//按下esc的时候,光标退出编辑区，切换至标题栏
if (modifiers == Qt::NoModifier && e->key() == Qt::Key_Escape) {
Expand Down