summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2017-10-29 21:39:20 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2017-12-01 21:55:38 -0500
commit2a7c72645064c00cb8fbbc0f5d611ae286fc8f6d (patch)
treeae8cecbc20ea701e984de17d4ceef874458f71a2
parent4f78f434da40093fc9f5431d49c77e9f49225fef (diff)
squashme - slideshow tweaks
-rw-r--r--src/branding/parabola/show.qml13
-rw-r--r--src/qml/calamares/slideshow/Slide.qml17
2 files changed, 11 insertions, 19 deletions
diff --git a/src/branding/parabola/show.qml b/src/branding/parabola/show.qml
index 31966e161..1d747bb78 100644
--- a/src/branding/parabola/show.qml
+++ b/src/branding/parabola/show.qml
@@ -41,15 +41,10 @@ Presentation
{
Image
{
- id: 'background1'
- source: 'Wallpaper_Parabola_Landscape_846x544.png'
-// x: -42
-// y: -109
-// width: 8460
-// height: 5404
- fillMode: Image.Stretch
-// n anchors.centerIn: parent
- anchors.fill: parent
+ id: 'background1'
+ source: 'Wallpaper_Parabola_Landscape_846x544.png'
+ fillMode: Image.Stretch
+ anchors.fill: parent
}
}
}
diff --git a/src/qml/calamares/slideshow/Slide.qml b/src/qml/calamares/slideshow/Slide.qml
index ecb99fac8..fa9e0253e 100644
--- a/src/qml/calamares/slideshow/Slide.qml
+++ b/src/qml/calamares/slideshow/Slide.qml
@@ -87,20 +87,17 @@ Item {
property real contentWidth: width
// Define the slide to be the "content area"
- property real fillMarginX: 0.05
- property real fillMarginY: 0.2
- x: parent.width * fillMarginX
- y: parent.height * fillMarginY
- width: parent.width - (x * 2.0)
- height: parent.height - (y * 2.0)
+ // property real fillMarginX: 0.05
+ // property real fillMarginY: 0.2
// Define the slide to completely fill the parent area
property real fillMarginX: 0.0
property real fillMarginY: 0.0
-// x: 0
-// y: 0
-// width: parent.width
-// height: parent.height
+
+ x: parent.width * fillMarginX
+ y: parent.height * fillMarginY
+ width: parent.width - (x * 2.0)
+ height: parent.height - (y * 2.0)
property real masterWidth: parent.width
property real masterHeight: parent.height