Commit ceb879d0 authored by Aleksi Suomalainen's avatar Aleksi Suomalainen Committed by eekkelund

compositor changes

parent 4780bb28
...@@ -13,7 +13,7 @@ int GlacierWindowModel::getWindowIdForTitle(QString title) ...@@ -13,7 +13,7 @@ int GlacierWindowModel::getWindowIdForTitle(QString title)
bool GlacierWindowModel::approveWindow(LipstickCompositorWindow *window) bool GlacierWindowModel::approveWindow(LipstickCompositorWindow *window)
{ {
bool accepted = window->isInProcess() == false && window->category() != QLatin1String("overlay") && window->category() != QLatin1String("cover"); bool accepted = window->isInProcess() == false && window->category() != QLatin1String("overlay") && window->category() != QLatin1String("cover") && window->windowFlags() != 2;
if (accepted) { if (accepted) {
m_titles.insert(window->title(), window->windowId()); m_titles.insert(window->title(), window->windowId());
} }
......
...@@ -36,7 +36,7 @@ WindowWrapperBase { ...@@ -36,7 +36,7 @@ WindowWrapperBase {
uniform mediump float qt_Opacity; uniform mediump float qt_Opacity;
varying highp vec2 qt_TexCoord0; varying highp vec2 qt_TexCoord0;
void main() { void main() {
gl_FragColor = qt_Opacity * texture2D(source, qt_TexCoord0); gl_FragColor = (qt_Opacity * texture2D(source, qt_TexCoord0));
}" }"
} }
onWindowChanged: { onWindowChanged: {
......
...@@ -296,7 +296,7 @@ Item { ...@@ -296,7 +296,7 @@ Item {
var window = null var window = null
var wi = null var wi = null
if (o) if (o)
window = o window = o.userData
if (window == null) if (window == null)
window = homeWindow window = homeWindow
...@@ -371,8 +371,9 @@ Item { ...@@ -371,8 +371,9 @@ Item {
if (isHomeWindow) { if (isHomeWindow) {
comp.homeWindow = w comp.homeWindow = w
setCurrentWindow(homeWindow) setCurrentWindow(homeWindow)
} else if (isNotificationWindow || isOverlayWindow) { } else if (isNotificationWindow) {
} else if (isOverlayWindow) {
setCurrentWindow(window)
} else if (isDialogWindow) { } else if (isDialogWindow) {
setCurrentWindow(window) setCurrentWindow(window)
} else if (isAlarmWindow) { } else if (isAlarmWindow) {
......
...@@ -112,7 +112,7 @@ INSTALLS += styles \ ...@@ -112,7 +112,7 @@ INSTALLS += styles \
settingspluginconfig \ settingspluginconfig \
applauncher applauncher
CONFIG += qt link_pkgconfig CONFIG += qt link_pkgconfig qml_debug
QT += quick QT += quick
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 7) { equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 7) {
QT += compositor QT += compositor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment