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
b4513e3b
Commit
b4513e3b
authored
Feb 19, 2019
by
eekkelund
Committed by
eetu
May 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Orientation] Fix window size on launch with Qt5.12
parent
470176bd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
7 deletions
+12
-7
main.cpp
src/main.cpp
+0
-1
GlacierRotation.qml
src/qml/GlacierRotation.qml
+2
-2
MainScreen.qml
src/qml/MainScreen.qml
+6
-1
WindowWrapperBase.qml
src/qml/compositor/WindowWrapperBase.qml
+3
-3
compositor_new.qml
src/qml/compositor_new.qml
+1
-0
No files found.
src/main.cpp
View file @
b4513e3b
...
...
@@ -74,7 +74,6 @@ int main(int argc, char **argv)
// Fixes a bug where some applications wouldn't launch, eg. terminal or browser
setenv
(
"EGL_PLATFORM"
,
"wayland"
,
1
);
setenv
(
"QT_QPA_PLATFORM"
,
"wayland"
,
1
);
setenv
(
"QT_WAYLAND_DISABLE_WINDOWDECORATION"
,
"1"
,
1
);
setenv
(
"QT_IM_MODULE"
,
"qtvirtualkeyboard"
,
1
);
app
.
mainWindowInstance
()
->
showFullScreen
();
return
app
.
exec
();
...
...
src/qml/GlacierRotation.qml
View file @
b4513e3b
...
...
@@ -55,9 +55,9 @@ Item {
}
}
function
rotateObject
(
obj
,
o
)
{
function
rotateObject
(
obj
,
o
,
force
)
{
var
r
=
Screen
.
angleBetween
(
o
,
Screen
.
primaryOrientation
)
if
(
obj
.
rotation
!==
r
)
if
(
obj
.
rotation
!==
r
||
force
)
rotateObjectToAngle
(
obj
,
r
)
}
...
...
src/qml/MainScreen.qml
View file @
b4513e3b
...
...
@@ -29,7 +29,7 @@
**
****************************************************************************************/
import
QtQuick
2.
6
import
QtQuick
2.
9
import
QtQuick
.
Controls
1.0
import
QtQuick
.
Controls
.
Nemo
1.0
import
QtQuick
.
Controls
.
Styles
.
Nemo
1.0
...
...
@@ -100,12 +100,17 @@ Page {
}
onParentChanged
:
{
glacierRotation
.
rotationParent
=
desktop
.
parent
glacierRotation
.
rotateRotationParent
(
nativeOrientation
)
glacierRotation
.
rotateObject
(
desktop
.
parent
,
nativeOrientation
,
true
)
}
Component
.
onCompleted
:
{
glacierRotation
.
rotationParent
=
desktop
.
parent
setLockScreen
(
true
)
Desktop
.
instance
=
desktop
Lipstick
.
compositor
.
screenOrientation
=
nativeOrientation
}
Connections
{
...
...
src/qml/compositor/WindowWrapperBase.qml
View file @
b4513e3b
...
...
@@ -20,14 +20,14 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
import
QtQuick
2.
6
import
QtQuick
2.
9
Item
{
id
:
wrapper
property
Item
window
width
:
window
.
width
height
:
window
.
height
width
:
window
!==
null
?
window
.
width
:
0
height
:
window
!==
null
?
window
.
height
:
0
NumberAnimation
on
opacity
{
id
:
fadeInAnimation
;
running
:
false
;
from
:
0
;
to
:
1
}
function
animateIn
()
{
fadeInAnimation
.
start
();
}
...
...
src/qml/compositor_new.qml
View file @
b4513e3b
...
...
@@ -380,6 +380,7 @@ Item {
}
onSensorOrientationChanged
:
{
screenOrientation
=
sensorOrientation
contentOrientation
=
screenOrientation
}
onDisplayOff
:
if
(
comp
.
topmostAlarmWindow
==
null
)
...
...
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