Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/editor/dtextedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7547,7 +7547,9 @@ void TextEdit::resizeEvent(QResizeEvent *e)
markAllKeywordInView();

// 当前处于文档页面尾部时,缩放后保持焦点在文档页面尾部
if (e->oldSize().width() < e->size().width() && verticalScrollBar()->maximum() == verticalScrollBar()->value()) {
// maximum() > 0: 排除文档为空或尚未加载的情况(此时 max==val==0 恒成立)
if (e->oldSize().width() < e->size().width() && verticalScrollBar()->maximum() == verticalScrollBar()->value()
&& verticalScrollBar()->maximum() > 0) {
// 使用 QPointer 检查对象是否还存在
QPointer<TextEdit> self(this);
QTimer::singleShot(0, [self]() {
Expand Down
4 changes: 3 additions & 1 deletion src/editor/editwrapper.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2017 - 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2017 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -1312,6 +1312,8 @@ void EditWrapper::loadContent(const QByteArray &strContent)
QByteArray text = strContent.mid(InitContentPos, len - InitContentPos);
data = codec->toUnicode(text.constData(), text.size(), &state);
cursor.insertText(data);
// 第二次insertText会导致Qt内部跟随滚动,需重置视口到文档开头
m_pTextEdit->verticalScrollBar()->setValue(0);
inserted += (len - InitContentPos);
progress = (inserted * 1.0) / len * 100;
m_pBottomBar->setProgress(static_cast<int>(progress));
Expand Down
Loading