From 48a1a5564f89e1e8f0b6f4a28398e4ae0b3f751c Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 8 Feb 2023 13:26:22 +0100 Subject: Examples: move widgets/codeeditor into manual tests It's not a very well written example, using (largely unneed) hacks to implement what it does. It's also misleading - the syntaxhighlighter example is a better showcase for building a useful code editor. Move it to manual tests. Fixes: QTBUG-111025 Pick-to: 6.5 Change-Id: I405d41688235bf3e9a08373e716769f26d02fec6 Reviewed-by: Eskil Abrahamsen Blomfeldt --- examples/widgets/widgets/codeeditor/CMakeLists.txt | 37 ------ examples/widgets/widgets/codeeditor/codeeditor.cpp | 134 --------------------- examples/widgets/widgets/codeeditor/codeeditor.h | 68 ----------- examples/widgets/widgets/codeeditor/codeeditor.pro | 8 -- examples/widgets/widgets/codeeditor/main.cpp | 18 --- 5 files changed, 265 deletions(-) delete mode 100644 examples/widgets/widgets/codeeditor/CMakeLists.txt delete mode 100644 examples/widgets/widgets/codeeditor/codeeditor.cpp delete mode 100644 examples/widgets/widgets/codeeditor/codeeditor.h delete mode 100644 examples/widgets/widgets/codeeditor/codeeditor.pro delete mode 100644 examples/widgets/widgets/codeeditor/main.cpp (limited to 'examples/widgets/widgets/codeeditor') diff --git a/examples/widgets/widgets/codeeditor/CMakeLists.txt b/examples/widgets/widgets/codeeditor/CMakeLists.txt deleted file mode 100644 index 0e8a3b49ff..0000000000 --- a/examples/widgets/widgets/codeeditor/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(codeeditor LANGUAGES CXX) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/widgets/codeeditor") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_standard_project_setup() - -qt_add_executable(codeeditor - codeeditor.cpp codeeditor.h - main.cpp -) - -set_target_properties(codeeditor PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(codeeditor PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -install(TARGETS codeeditor - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/widgets/codeeditor/codeeditor.cpp b/examples/widgets/widgets/codeeditor/codeeditor.cpp deleted file mode 100644 index 15f84622e4..0000000000 --- a/examples/widgets/widgets/codeeditor/codeeditor.cpp +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "codeeditor.h" - -#include -#include - -//![constructor] - -CodeEditor::CodeEditor(QWidget *parent) : QPlainTextEdit(parent) -{ - lineNumberArea = new LineNumberArea(this); - - connect(this, &CodeEditor::blockCountChanged, this, &CodeEditor::updateLineNumberAreaWidth); - connect(this, &CodeEditor::updateRequest, this, &CodeEditor::updateLineNumberArea); - connect(this, &CodeEditor::cursorPositionChanged, this, &CodeEditor::highlightCurrentLine); - - updateLineNumberAreaWidth(0); - highlightCurrentLine(); -} - -//![constructor] - -//![extraAreaWidth] - -int CodeEditor::lineNumberAreaWidth() -{ - int digits = 1; - int max = qMax(1, blockCount()); - while (max >= 10) { - max /= 10; - ++digits; - } - - int space = 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits; - - return space; -} - -//![extraAreaWidth] - -//![slotUpdateExtraAreaWidth] - -void CodeEditor::updateLineNumberAreaWidth(int /* newBlockCount */) -{ - setViewportMargins(lineNumberAreaWidth(), 0, 0, 0); -} - -//![slotUpdateExtraAreaWidth] - -//![slotUpdateRequest] - -void CodeEditor::updateLineNumberArea(const QRect &rect, int dy) -{ - if (dy) - lineNumberArea->scroll(0, dy); - else - lineNumberArea->update(0, rect.y(), lineNumberArea->width(), rect.height()); - - if (rect.contains(viewport()->rect())) - updateLineNumberAreaWidth(0); -} - -//![slotUpdateRequest] - -//![resizeEvent] - -void CodeEditor::resizeEvent(QResizeEvent *e) -{ - QPlainTextEdit::resizeEvent(e); - - QRect cr = contentsRect(); - lineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height())); -} - -//![resizeEvent] - -//![cursorPositionChanged] - -void CodeEditor::highlightCurrentLine() -{ - QList extraSelections; - - if (!isReadOnly()) { - QTextEdit::ExtraSelection selection; - - QColor lineColor = QColor(Qt::yellow).lighter(160); - - selection.format.setBackground(lineColor); - selection.format.setProperty(QTextFormat::FullWidthSelection, true); - selection.cursor = textCursor(); - selection.cursor.clearSelection(); - extraSelections.append(selection); - } - - setExtraSelections(extraSelections); -} - -//![cursorPositionChanged] - -//![extraAreaPaintEvent_0] - -void CodeEditor::lineNumberAreaPaintEvent(QPaintEvent *event) -{ - QPainter painter(lineNumberArea); - painter.fillRect(event->rect(), Qt::lightGray); - -//![extraAreaPaintEvent_0] - -//![extraAreaPaintEvent_1] - QTextBlock block = firstVisibleBlock(); - int blockNumber = block.blockNumber(); - int top = qRound(blockBoundingGeometry(block).translated(contentOffset()).top()); - int bottom = top + qRound(blockBoundingRect(block).height()); -//![extraAreaPaintEvent_1] - -//![extraAreaPaintEvent_2] - while (block.isValid() && top <= event->rect().bottom()) { - if (block.isVisible() && bottom >= event->rect().top()) { - QString number = QString::number(blockNumber + 1); - painter.setPen(Qt::black); - painter.drawText(0, top, lineNumberArea->width(), fontMetrics().height(), - Qt::AlignRight, number); - } - - block = block.next(); - top = bottom; - bottom = top + qRound(blockBoundingRect(block).height()); - ++blockNumber; - } -} -//![extraAreaPaintEvent_2] - diff --git a/examples/widgets/widgets/codeeditor/codeeditor.h b/examples/widgets/widgets/codeeditor/codeeditor.h deleted file mode 100644 index e8e6a583f0..0000000000 --- a/examples/widgets/widgets/codeeditor/codeeditor.h +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef CODEEDITOR_H -#define CODEEDITOR_H - -#include - -QT_BEGIN_NAMESPACE -class QPaintEvent; -class QResizeEvent; -class QSize; -class QWidget; -QT_END_NAMESPACE - -class LineNumberArea; - -//![codeeditordefinition] - -class CodeEditor : public QPlainTextEdit -{ - Q_OBJECT - -public: - CodeEditor(QWidget *parent = nullptr); - - void lineNumberAreaPaintEvent(QPaintEvent *event); - int lineNumberAreaWidth(); - -protected: - void resizeEvent(QResizeEvent *event) override; - -private slots: - void updateLineNumberAreaWidth(int newBlockCount); - void highlightCurrentLine(); - void updateLineNumberArea(const QRect &rect, int dy); - -private: - QWidget *lineNumberArea; -}; - -//![codeeditordefinition] -//![extraarea] - -class LineNumberArea : public QWidget -{ -public: - LineNumberArea(CodeEditor *editor) : QWidget(editor), codeEditor(editor) - {} - - QSize sizeHint() const override - { - return QSize(codeEditor->lineNumberAreaWidth(), 0); - } - -protected: - void paintEvent(QPaintEvent *event) override - { - codeEditor->lineNumberAreaPaintEvent(event); - } - -private: - CodeEditor *codeEditor; -}; - -//![extraarea] - -#endif diff --git a/examples/widgets/widgets/codeeditor/codeeditor.pro b/examples/widgets/widgets/codeeditor/codeeditor.pro deleted file mode 100644 index 5618160d17..0000000000 --- a/examples/widgets/widgets/codeeditor/codeeditor.pro +++ /dev/null @@ -1,8 +0,0 @@ -QT += widgets - -HEADERS = codeeditor.h -SOURCES = main.cpp \ - codeeditor.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/codeeditor -INSTALLS += target diff --git a/examples/widgets/widgets/codeeditor/main.cpp b/examples/widgets/widgets/codeeditor/main.cpp deleted file mode 100644 index 20b72b18ae..0000000000 --- a/examples/widgets/widgets/codeeditor/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include - -#include "codeeditor.h" - -int main(int argv, char **args) -{ - QApplication app(argv, args); - - CodeEditor editor; - editor.setWindowTitle(QObject::tr("Code Editor Example")); - editor.show(); - - return app.exec(); -} - -- cgit v1.2.3