Skip to content

修改文本编辑器父组件为QTextEdit #30

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

Open
miscmo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修改文本编辑器父组件为QTextEdit #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97be63a
change text edit object
miscmo Jun 29, 2024
a07ac85
fix
Jul 2, 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
1 change: 1 addition & 0 deletions MindNote开发记录/2a976788f157401781914e3ed4ff50b1/defnote.mind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Release v1.0
- [ ] 增加查看视图，渲染markdown格式的查看
- [ ] 增加VIM输入模式
- [ ] 增加状态栏字数和选中字数展示
- [ ] 表格编辑

侧边栏：
- [x] 点击两次重命名（区分双击展开折叠）
Expand Down
20 changes: 12 additions & 8 deletions src/Widgets/NoteEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <QTextBlock>
#include <QShortcut>
#include <QScrollBar>
#include <QAbstractTextDocumentLayout>

#include <QDebug>

Expand All @@ -37,7 +38,7 @@ NoteEditor *NoteEditor::getInstance() {
}

NoteEditor::NoteEditor(QWidget *parent)
: QPlainTextEdit(parent) {
: QTextEdit(parent) {

initUi();

Expand Down Expand Up @@ -96,7 +97,7 @@ const QFont &NoteEditor::getCurFont() {

int NoteEditor::lineNumberAreaWidth() {
int digits = 1;
int max = qMax(1, blockCount());
int max = qMax(1, document()->blockCount());
while (max >= 10) {
max /= 10;
++digits;
Expand Down Expand Up @@ -133,7 +134,7 @@ void NoteEditor::updateLineNumberArea(const QRect &rect, int dy)

void NoteEditor::resizeEvent(QResizeEvent *e)
{
QPlainTextEdit::resizeEvent(e);
QTextEdit::resizeEvent(e);

QRect cr = contentsRect();
m_pLineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height()));
Expand Down Expand Up @@ -168,7 +169,7 @@ void NoteEditor::keyPressEvent(QKeyEvent *event) {
return; // 防止进一步处理回车键
}

QPlainTextEdit::keyPressEvent(event);
QTextEdit::keyPressEvent(event);
}

//![resizeEvent]
Expand Down Expand Up @@ -206,10 +207,12 @@ void NoteEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
//![extraAreaPaintEvent_0]

//![extraAreaPaintEvent_1]
QTextBlock block = firstVisibleBlock();
QTextBlock block = document()->begin();
int blockNumber = block.blockNumber();
int top = (int) blockBoundingGeometry(block).translated(contentOffset()).top();
int bottom = top + (int) blockBoundingRect(block).height();
//int top = (int) blockBoundingGeometry(block).translated(contentOffset()).top();
//int bottom = top + (int) blockBoundingRect(block).height();
int top = (int)document()->documentLayout()->blockBoundingRect(block).translated(QPoint(0, -verticalScrollBar()->value())).top();
int bottom = top + (int)document()->documentLayout()->blockBoundingRect(block).height();
//![extraAreaPaintEvent_1]

//![extraAreaPaintEvent_2]
Expand All @@ -223,7 +226,8 @@ void NoteEditor::lineNumberAreaPaintEvent(QPaintEvent *event)

block = block.next();
top = bottom;
bottom = top + (int) blockBoundingRect(block).height();
//bottom = top + (int) blockBoundingRect(block).height();
bottom = top + (int)document()->documentLayout()->blockBoundingRect(block).height();
++blockNumber;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Widgets/NoteEditor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef NOTEEDITOR_H
#define NOTEEDITOR_H

#include <QPlainTextEdit>
#include <QTextEdit>
#include <Widgets/Highlighter/NoteHighlighter.h>

class QTreeWidgetItem;
Expand All @@ -13,7 +13,7 @@ class Buffer;
class LineNumberArea;
class Node;

class NoteEditor : public QPlainTextEdit {
class NoteEditor : public QTextEdit {
Q_OBJECT
public:
static NoteEditor *getInstance();
Expand Down