diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2017-10-28 11:57:01 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2017-12-01 21:55:38 -0500 |
| commit | 4f78f434da40093fc9f5431d49c77e9f49225fef (patch) | |
| tree | 961097beada9ba2cca8c6e9b95925a4a7e85c316 | |
| parent | bda088d368bbe2ef05ede650dabb56ee46d008bc (diff) | |
squashme - slideshow tweaks
| -rw-r--r-- | src/branding/parabola/show.qml | 15 | ||||
| -rw-r--r-- | src/qml/calamares/slideshow/Slide.qml | 18 |
2 files changed, 23 insertions, 10 deletions
diff --git a/src/branding/parabola/show.qml b/src/branding/parabola/show.qml index d930df38e..31966e161 100644 --- a/src/branding/parabola/show.qml +++ b/src/branding/parabola/show.qml @@ -41,12 +41,15 @@ Presentation { Image { - id: 'background1' - source: 'Wallpaper_Parabola_Landscape_846x544.png' - x: -42 - y: -109 - width: 846 - height: 544 + 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 } } } diff --git a/src/qml/calamares/slideshow/Slide.qml b/src/qml/calamares/slideshow/Slide.qml index e033e3c17..ecb99fac8 100644 --- a/src/qml/calamares/slideshow/Slide.qml +++ b/src/qml/calamares/slideshow/Slide.qml @@ -87,10 +87,20 @@ Item { property real contentWidth: width // Define the slide to be the "content area" - x: parent.width * 0.05 - y: parent.height * 0.2 - width: parent.width * 0.9 - height: parent.height * 0.7 + 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) + + // 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 property real masterWidth: parent.width property real masterHeight: parent.height |