From 693adfc62ac2290781b09a1060251025e971e8bd Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Fri, 15 Sep 2017 11:24:20 -0400 Subject: [PATCH] Use grow and shrink names instead of bigger and smaller --- src/FlightDisplay/FlightDisplayView.qml | 4 ++-- src/QmlControls/QGCPipable.qml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 25e541d96..2f7e48ede 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -311,7 +311,7 @@ QGCView { onHideIt: { setPipVisibility(!state) } - onBigger: { + onGrow: { if (_pipSize >= 825) { return } @@ -320,7 +320,7 @@ QGCView { _flightVideoPipControl.width = _pipSize _flightVideoPipControl.height= _pipSize * (9/16) } - onSmaller: { + onShrink: { if (_pipSize <= 225) { return } diff --git a/src/QmlControls/QGCPipable.qml b/src/QmlControls/QGCPipable.qml index a955b2438..bd4f9358d 100644 --- a/src/QmlControls/QGCPipable.qml +++ b/src/QmlControls/QGCPipable.qml @@ -24,8 +24,8 @@ Item { signal activated() signal hideIt(bool state) - signal bigger() - signal smaller() + signal grow() + signal shrink() MouseArea { anchors.fill: parent @@ -36,20 +36,20 @@ Item { } QGCButton { - id: largerButton + id: growButton visible: !isHidden anchors.left: parent.left - anchors.bottom: smallerButton.top + anchors.bottom: shrinkButton.top height: 20 width: height anchors.margins: 5 text: "+" opacity: 0.5 - onClicked: pip.bigger() + onClicked: pip.grow() } QGCButton { - id: smallerButton + id: shrinkButton visible: !isHidden anchors.left: parent.left anchors.bottom: closePIP.top @@ -58,7 +58,7 @@ Item { anchors.margins: 5 text: "-" opacity: 0.5 - onClicked: pip.smaller() + onClicked: pip.shrink() } //-- PIP Corner Indicator -- 2.22.0