diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:54:52 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:54:53 +0200 |
commit | 15dc8b1d8e2db00dfcbe8d7f21150658f5de45b6 (patch) | |
tree | 6b9c908ca1cf0b1395fa91415f19b5adf8642ca7 /examples/widgets/widgets/codeeditor/codeeditor.h | |
parent | ecc83677006dc7dffcd2417b1e3cff88b0615756 (diff) | |
parent | 6234286925153279ca259cec04429fa584187b16 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I46ec05ade1c84e61f7f45562a218aa9ff55e2975
Diffstat (limited to 'examples/widgets/widgets/codeeditor/codeeditor.h')
-rw-r--r-- | examples/widgets/widgets/codeeditor/codeeditor.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/examples/widgets/widgets/codeeditor/codeeditor.h b/examples/widgets/widgets/codeeditor/codeeditor.h index 5a48abafc4..283a4e0bdf 100644 --- a/examples/widgets/widgets/codeeditor/codeeditor.h +++ b/examples/widgets/widgets/codeeditor/codeeditor.h @@ -80,7 +80,7 @@ protected: private slots: void updateLineNumberAreaWidth(int newBlockCount); void highlightCurrentLine(); - void updateLineNumberArea(const QRect &, int); + void updateLineNumberArea(const QRect &rect, int dy); private: QWidget *lineNumberArea; @@ -92,16 +92,17 @@ private: class LineNumberArea : public QWidget { public: - LineNumberArea(CodeEditor *editor) : QWidget(editor) { - codeEditor = editor; - } + LineNumberArea(CodeEditor *editor) : QWidget(editor), codeEditor(editor) + {} - QSize sizeHint() const override { + QSize sizeHint() const override + { return QSize(codeEditor->lineNumberAreaWidth(), 0); } protected: - void paintEvent(QPaintEvent *event) override { + void paintEvent(QPaintEvent *event) override + { codeEditor->lineNumberAreaPaintEvent(event); } |