aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop-unified
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2018-01-19 15:29:36 -0500
committerKen Moore <ken@ixsystems.com>2018-01-19 15:29:36 -0500
commit0f7272f3bf78e65103a6a3448ea155b28e00aad2 (patch)
tree2ba3728e9c962b28c3ca5b84de68554e0e9288ed /src-qt5/core/lumina-desktop-unified
parentGet some more of Lumina 2 cleaned up: (diff)
downloadlumina-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
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified')
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/NativeWindow.qml9
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp3
2 files changed, 10 insertions, 2 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()){
bgstack15