Skip to content

GimbalIndicator: prevent text from jittering around #13204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

GimbalIndicator: prevent text from jittering around #13204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/UI/toolbar/GimbalIndicator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import QGroundControl.FactControls

Item {
id: control
width: gimbalIndicatorIcon.width * 1.1 + gimbalTelemetryLayout.childrenRect.width + margins
width: gimbalIndicatorIcon.width * 1.1 + ScreenTools.defaultFontPixelWidth * 12 + margins
anchors.top: parent.top
anchors.bottom: parent.bottom

Expand Down Expand Up @@ -376,6 +376,7 @@ Item {
anchors.left: gimbalIndicatorIcon.right
anchors.leftMargin: margins
anchors.verticalCenter: parent.verticalCenter
width: ScreenTools.defaultFontPixelWidth * 12
columns: 2
rows: 2
rowSpacing: 0
Expand All @@ -389,17 +390,20 @@ Item {
(activeGimbal && activeGimbal.yawLock ? qsTr("Yaw locked") : qsTr("Yaw follow"))
Layout.columnSpan: 2
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: ScreenTools.defaultFontPixelWidth * 10
}
QGCLabel {
id: pitchLabel
text: activeGimbal ? qsTr("P: ") + activeGimbal.absolutePitch.rawValue.toFixed(1) : ""
text: activeGimbal ? qsTr("P: ") + Math.round(activeGimbal.absolutePitch.rawValue) : ""
Layout.preferredWidth: ScreenTools.defaultFontPixelWidth * 5
}
QGCLabel {
id: panLabel
text: activeGimbal ?
gimbalTelemetryLayout.showAzimuth ? (qsTr("Az: ") + activeGimbal.absoluteYaw.rawValue.toFixed(1)) :
(qsTr("Y: ") + activeGimbal.bodyYaw.rawValue.toFixed(1)) :
gimbalTelemetryLayout.showAzimuth ? (qsTr("Az: ") + Math.round(activeGimbal.absoluteYaw.rawValue)) :
(qsTr("Y: ") + Math.round(activeGimbal.bodyYaw.rawValue)) :
""
Layout.preferredWidth: ScreenTools.defaultFontPixelWidth * 6
}
}

Expand Down
Loading