Commit 40af6488 authored by Michal Policht's avatar Michal Policht

Merge commit 'd035e939' into 2

parents 3cff97bf d035e939
Pipeline #15655 passed with stages
in 12 minutes and 48 seconds
...@@ -13,6 +13,10 @@ Element { ...@@ -13,6 +13,10 @@ Element {
active: true active: true
readonly property real wayWidth: units.quadrat * 0.25
readonly property real wayHeight: units.quadrat * 0.25
property bool leftWay: true property bool leftWay: true
property bool rightWay: true property bool rightWay: true
...@@ -33,8 +37,8 @@ Element { ...@@ -33,8 +37,8 @@ Element {
SymbolCanvas { SymbolCanvas {
id: canvas id: canvas
implicitWidth: units.quadrat * 0.25 implicitWidth: root.wayWidth
implicitHeight: units.quadrat * 0.25 implicitHeight: root.wayHeight
element: root element: root
...@@ -71,8 +75,8 @@ Element { ...@@ -71,8 +75,8 @@ Element {
Loader { Loader {
y: topWay ? 0.5 * height : 0 y: topWay ? 0.5 * height : 0
width: item ? item.implicitWidth : 0 width: leftWay ? wayWidth : 0
height: item ? item.implicitHeight : 0 height: leftWay ? wayHeight : 0
sourceComponent: leftWay ? way : undefined sourceComponent: leftWay ? way : undefined
property bool closed: leftClosed property bool closed: leftClosed
...@@ -81,8 +85,8 @@ Element { ...@@ -81,8 +85,8 @@ Element {
Loader { Loader {
x: leftWay ? width : (topWay || bottomWay) ? width * 0.5 : 0 x: leftWay ? width : (topWay || bottomWay) ? width * 0.5 : 0
y: topWay ? 0.5 * height : 0 y: topWay ? 0.5 * height : 0
width: item ? item.implicitWidth : 0 width: rightWay ? wayWidth : 0
height: item ? item.implicitHeight : 0 height: rightWay ? wayHeight : 0
rotation: 180 rotation: 180
sourceComponent: rightWay ? way : undefined sourceComponent: rightWay ? way : undefined
...@@ -91,8 +95,8 @@ Element { ...@@ -91,8 +95,8 @@ Element {
Loader { Loader {
x: leftWay ? width * 0.5 : 0 x: leftWay ? width * 0.5 : 0
width: item ? item.implicitWidth : 0 width: topWay ? wayWidth : 0
height: item ? item.implicitHeight : 0 height: topWay ? wayHeight : 0
rotation: 90 rotation: 90
sourceComponent: topWay ? way : undefined sourceComponent: topWay ? way : undefined
...@@ -102,8 +106,8 @@ Element { ...@@ -102,8 +106,8 @@ Element {
Loader { Loader {
x: leftWay ? width * 0.5 : 0 x: leftWay ? width * 0.5 : 0
y: topWay ? height : (leftWay || rightWay) ? height * 0.5 : 0 y: topWay ? height : (leftWay || rightWay) ? height * 0.5 : 0
width: item ? item.implicitWidth : 0 width: bottomWay ? wayWidth : 0
height: item ? item.implicitHeight : 0 height: bottomWay ? wayHeight : 0
rotation: -90 rotation: -90
sourceComponent: bottomWay ? way : undefined sourceComponent: bottomWay ? way : undefined
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment