diff options
| author | Ken Moore <ken@ixsystems.com> | 2018-01-19 15:29:36 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2018-01-19 15:29:36 -0500 |
| commit | 0f7272f3bf78e65103a6a3448ea155b28e00aad2 (patch) | |
| tree | 2ba3728e9c962b28c3ca5b84de68554e0e9288ed | |
| parent | Get some more of Lumina 2 cleaned up: (diff) | |
| download | lumina-0f7272f3bf78e65103a6a3448ea155b28e00aad2.tar.gz lumina-0f7272f3bf78e65103a6a3448ea155b28e00aad2.tar.bz2 lumina-0f7272f3bf78e65103a6a3448ea155b28e00aad2.zip | |
a Couple more minor tweaks.
Have lumina-textedit treat .qml as javascript for syntax highlighting
3 files changed, 11 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/NativeWindow.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/NativeWindow.qml index 19ff4da9..67d4b748 100644 --- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/NativeWindow.qml +++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/NativeWindow.qml @@ -18,7 +18,7 @@ Rectangle { border.width: 5 border.color: palette.highlight radius: 5 - color: palette.window + color: palette.window //"transparent" x: object.frameGeometry.x y: object.frameGeometry.y width: object.frameGeometry.width @@ -202,6 +202,13 @@ Rectangle { anchors.bottomMargin: windowFrame.border.width width: parent.width height: parent.height + //color: palette.window + + //Image { + //anchors.fill: frameContents + //cache: false + //source: windowFrame.object.winImage + //} MouseArea { width: parent.width diff --git a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp index a3bac808..4a2e3545 100644 --- a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp @@ -629,9 +629,10 @@ void NativeWindowSystem::SetupNewWindow(NativeWindowObject *win){ } QImage NativeWindowSystem::GetWindowImage(NativeWindowObject* win){ - QImage img; //qDebug() << "Update Window Image:" << win->name(); QRect geom(QPoint(0,0), win->property(NativeWindowObject::Size).toSize()); + QImage img; //(geom.width(), geom.height(), QImage::Format_ARGB32); + //img.fill(QGuiApplication::palette().window()); if(DISABLE_COMPOSITING){ QList<QScreen*> screens = static_cast<QApplication*>( QApplication::instance() )->screens(); if(!screens.isEmpty()){ diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/javascript.syntax b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/javascript.syntax index 02e1092a..a5ddee9d 100644 --- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/javascript.syntax +++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/javascript.syntax @@ -8,7 +8,7 @@ { "meta": { "name": "Javascript", - "file_suffix": ["js"] + "file_suffix": ["js", "qml"] }, "format": { "line_wrap": false, |