Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
glacier-home
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
glacier-home
Commits
ceb879d0
Commit
ceb879d0
authored
Oct 07, 2017
by
Aleksi Suomalainen
Committed by
eekkelund
Apr 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compositor changes
parent
4780bb28
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
glacierwindowmodel.cpp
src/glacierwindowmodel.cpp
+1
-1
WindowWrapperAlpha.qml
src/qml/compositor/WindowWrapperAlpha.qml
+1
-1
compositor_new.qml
src/qml/compositor_new.qml
+4
-3
src.pro
src/src.pro
+1
-1
No files found.
src/glacierwindowmodel.cpp
View file @
ceb879d0
...
@@ -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
());
}
}
...
...
src/qml/compositor/WindowWrapperAlpha.qml
View file @
ceb879d0
...
@@ -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
:
{
...
...
src/qml/compositor_new.qml
View file @
ceb879d0
...
@@ -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
)
{
...
...
src/src.pro
View file @
ceb879d0
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment