diff --git a/src/UI/DocumentViews/TimingView.cc b/src/UI/DocumentViews/TimingView.cc index 8754ec09d145d29f1deac520e6b3df74662edbe6..0ef6c16b1b1001716ca571c2ce80ba95f9acbd91 100644 --- a/src/UI/DocumentViews/TimingView.cc +++ b/src/UI/DocumentViews/TimingView.cc @@ -20,7 +20,7 @@ TimingView::TimingView(QImage img, quint64 soundLength, QWidget *parent) noexcep { scene = new TimingScene(img, soundLength, this); setFixedHeight(img.height()); - setMaximumHeight(img.height() + horizontalScrollBar()->height()); + setMaximumHeight(img.height()); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum); diff --git a/src/UI/ScriptDocumentView.cc b/src/UI/ScriptDocumentView.cc index f529e4f0026e82b7676152beae0d8cba85bb64ad..9a00fffb5c14ba62171732fe0c7b61987b4f9152 100644 --- a/src/UI/ScriptDocumentView.cc +++ b/src/UI/ScriptDocumentView.cc @@ -1,5 +1,6 @@ #include "ScriptDocumentView.hh" #include "ScriptViews/ScriptEditor.hh" +#include "ScriptViews/ScriptHighlighter.hh" #include "../VivyApplication.hh" #include <QVBoxLayout> @@ -9,6 +10,7 @@ using namespace Vivy; ScriptDocumentView::ScriptDocumentView(const QString &path, QWidget *parent) : AbstractDocumentView(AbstractDocumentView::Type::Script, parent) , editor(new ScriptEditor(this)) + , syntax(new ScriptHighlighter(editor->document())) { QFile textFile(path); if (!textFile.open(QIODevice::ReadOnly | QIODevice::Text)) { diff --git a/src/UI/ScriptDocumentView.hh b/src/UI/ScriptDocumentView.hh index 530b9bfa60d864ad9f2b3eec624ee4c4c2fdae0f..15b2be984092776f7b82ddbeb3ab4ee5e6774428 100644 --- a/src/UI/ScriptDocumentView.hh +++ b/src/UI/ScriptDocumentView.hh @@ -14,6 +14,7 @@ namespace Vivy { class ScriptEditor; +class ScriptHighlighter; class ScriptDocumentView final : public AbstractDocumentView { Q_OBJECT @@ -36,6 +37,7 @@ public: private: ScriptEditor *editor{ nullptr }; + ScriptHighlighter *syntax{ nullptr }; }; } diff --git a/src/UI/ScriptViews/ScriptHighlighter.hh b/src/UI/ScriptViews/ScriptHighlighter.hh index 15227bb03e096a8ecb369bffa546c4310533dcb4..655f8755f96a51b18a9e7e7a9d74f36487eba44b 100644 --- a/src/UI/ScriptViews/ScriptHighlighter.hh +++ b/src/UI/ScriptViews/ScriptHighlighter.hh @@ -54,9 +54,9 @@ private: void resetHighlightingRule() noexcept; const HighlightingTheme darkHighlightingTheme = { - .functionForeground = Qt::blue, - .keywordForeground = Qt::darkBlue, - .valueForeground = Qt::red, + .functionForeground = Qt::darkCyan, + .keywordForeground = Qt::darkYellow, + .valueForeground = QColor(Qt::cyan).darker(120), .quotationForeground = Qt::darkGreen, .commentForeground = QColor(Qt::darkGray).darker(120), };