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
5c05cfcc
Commit
5c05cfcc
authored
Apr 03, 2014
by
Aleksi Suomalainen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[covers] Remove application covers from window model and do not show cover as window.
parent
d6ce9ea7
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
50 additions
and
16 deletions
+50
-16
glacierwindowmodel.cpp
src/glacierwindowmodel.cpp
+14
-0
glacierwindowmodel.h
src/glacierwindowmodel.h
+18
-0
main.cpp
src/main.cpp
+4
-1
AppSwitcher.qml
src/qml/AppSwitcher.qml
+2
-1
SwitcherItem.qml
src/qml/SwitcherItem.qml
+1
-1
compositor.qml
src/qml/compositor.qml
+5
-1
WindowWrapperBase.qml
src/qml/compositor/WindowWrapperBase.qml
+0
-1
WindowWrapperMystic.qml
src/qml/compositor/WindowWrapperMystic.qml
+0
-7
src.pro
src/src.pro
+6
-4
No files found.
src/glacierwindowmodel.cpp
0 → 100644
View file @
5c05cfcc
#include "glacierwindowmodel.h"
GlacierWindowModel
::
GlacierWindowModel
()
:
WindowModel
()
{
}
GlacierWindowModel
::~
GlacierWindowModel
()
{
}
bool
GlacierWindowModel
::
approveWindow
(
LipstickCompositorWindow
*
window
)
{
return
window
->
isInProcess
()
==
false
&&
window
->
category
()
!=
QLatin1String
(
"overlay"
)
&&
window
->
category
()
!=
QLatin1String
(
"cover"
);
}
src/glacierwindowmodel.h
0 → 100644
View file @
5c05cfcc
#ifndef GLACIERWINDOWMODEL_H
#define GLACIERWINDOWMODEL_H
#include <windowmodel.h>
#include <lipstickcompositorwindow.h>
#include <QDebug>
class
LipstickCompositorWindow
;
class
QWaylandSurfaceItem
;
class
GlacierWindowModel
:
public
WindowModel
{
public:
explicit
GlacierWindowModel
();
~
GlacierWindowModel
();
bool
approveWindow
(
LipstickCompositorWindow
*
window
);
};
#endif // GLACIERWINDOWMODEL_H
src/main.cpp
View file @
5c05cfcc
...
...
@@ -24,6 +24,9 @@
#include <homeapplication.h>
#include <QFont>
#include <homewindow.h>
#include <QQmlEngine>
#include <QQmlContext>
#include "glacierwindowmodel.h"
int
main
(
int
argc
,
char
**
argv
)
{
...
...
@@ -35,9 +38,9 @@ int main(int argc, char **argv)
setenv
(
"QT_WAYLAND_DISABLE_WINDOWDECORATION"
,
"1"
,
1
);
app
.
setCompositorPath
(
"qrc:/qml/compositor.qml"
);
qmlRegisterType
<
GlacierWindowModel
>
(
"org.nemomobile.glacier"
,
1
,
0
,
"GlacierWindowModel"
);
app
.
setQmlPath
(
"qrc:/qml/MainScreen.qml"
);
app
.
mainWindowInstance
()
->
showFullScreen
();
return
app
.
exec
();
}
src/qml/AppSwitcher.qml
View file @
5c05cfcc
...
...
@@ -26,6 +26,7 @@ import QtQuick 2.0
import
org
.
nemomobile
.
lipstick
0.1
import
QtQuick
.
Controls
.
Nemo
1.0
import
QtQuick
.
Controls
.
Styles
.
Nemo
1.0
import
org
.
nemomobile
.
glacier
1.0
// App Switcher page
// The place for browsing already running apps
...
...
@@ -78,7 +79,7 @@ Item {
Repeater
{
id
:
gridRepeater
model
:
WindowModel
{
model
:
Glacier
WindowModel
{
id
:
switcherModel
}
...
...
src/qml/SwitcherItem.qml
View file @
5c05cfcc
...
...
@@ -28,7 +28,7 @@ import org.nemomobile.lipstick 0.1
MouseArea
{
id
:
switcherItemRoot
property
bool
rotateWindowContent
:
(
screen
.
frameBufferRotation
===
90
)
?
desktop
.
isPortrait
:
!
desktop
.
isPortrait
property
bool
rotateWindowContent
:
desktop
.
isPortrait
WindowPixmapItem
{
id
:
windowPixmap
...
...
src/qml/compositor.qml
View file @
5c05cfcc
...
...
@@ -224,8 +224,11 @@ Compositor {
var
isHomeWindow
=
window
.
isInProcess
&&
root
.
homeWindow
==
null
&&
window
.
title
==
"
Home
"
var
isNotificationWindow
=
window
.
category
==
"
notification
"
var
isOverlayWindow
=
window
.
category
==
"
overlay
"
var
parent
=
null
if
(
window
.
category
==
"
cover
"
)
{
window
.
visible
=
false
return
}
if
(
isHomeWindow
)
{
parent
=
homeLayer
}
else
if
(
isNotificationWindow
)
{
...
...
@@ -246,6 +249,7 @@ Compositor {
root
.
homeWindow
=
w
setCurrentWindow
(
homeWindow
)
}
else
if
(
isNotificationWindow
||
isOverlayWindow
)
{
}
else
{
w
=
mysticWrapper
.
createObject
(
parent
,
{
window
:
window
})
window
.
userData
=
w
...
...
src/qml/compositor/WindowWrapperBase.qml
View file @
5c05cfcc
...
...
@@ -29,7 +29,6 @@ Item {
width
:
window
.
width
height
:
window
.
height
NumberAnimation
on
opacity
{
id
:
fadeInAnimation
;
running
:
false
;
from
:
0
;
to
:
1
}
function
animateIn
()
{
fadeInAnimation
.
start
();
}
Component.onCompleted
:
window
.
parent
=
wrapper
...
...
src/qml/compositor/WindowWrapperMystic.qml
View file @
5c05cfcc
...
...
@@ -27,16 +27,9 @@ import org.nemomobile.lipstick 0.1
WindowWrapperBase
{
id
:
wrapper
ShaderEffect
{
anchors.fill
:
parent
z
:
2
/*hasCover: coverWindowId.value != undefined ? true : false
WindowProperty {
id: coverWindowId
windowId: window.windowId
property: "SAILFISH_COVER_WINDOW"
}*/
// source Item must be a texture provider
property
Item
source
:
wrapper
.
window
...
...
src/src.pro
View file @
5c05cfcc
...
...
@@ -12,12 +12,14 @@ config.path = /usr/share/lipstick
INSTALLS
+=
config
CONFIG
+=
qt
link_pkgconfig
QT
+=
quick
HEADERS
+=
QT
+=
quick
compositor
DEFINES
+=
QT_COMPOSITOR_QUICK
HEADERS
+=
\
glacierwindowmodel
.
h
SOURCES
+=
\
main
.
cpp
main
.
cpp
\
glacierwindowmodel
.
cpp
RESOURCES
+=
\
resources
-
qml
.
qrc
...
...
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