diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml index 2422712def267db054fff5dad56fd1471965e355..23ad56399ff2176721ad83914aa7442999130abc 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml @@ -361,6 +361,7 @@ QGCView { anchors.top: parent.top height: ScreenTools.defaultFontPixelWidth * 20 width: ScreenTools.defaultFontPixelWidth * 20 + sourceSize.width: width mipmap: true fillMode: Image.PreserveAspectFit visible: false diff --git a/src/AutoPilotPlugins/Common/ESP8266Component.qml b/src/AutoPilotPlugins/Common/ESP8266Component.qml index b76a533292920381453470f9ae1937217f0a9207..19c9bcc17a9c805c87f3a791005265f69e882279 100644 --- a/src/AutoPilotPlugins/Common/ESP8266Component.qml +++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml @@ -146,6 +146,7 @@ QGCView { color: palette.text width: ScreenTools.defaultFontPixelWidth * 12 height: width * 1.45 + sourceSize.height: width * 1.45 mipmap: true fillMode: Image.PreserveAspectFit source: wifiMode ? (wifiMode.value === 0 ? "/qmlimages/APMode.svg" : "/qmlimages/StationMode.svg") : "/qmlimages/APMode.svg" diff --git a/src/AutoPilotPlugins/PX4/CameraComponent.qml b/src/AutoPilotPlugins/PX4/CameraComponent.qml index c85a6cbd853a6b01ae3f6acd48e7e8ee0b888db9..d7e3e4cdb59203de5f32f7ba5d3af32174d51f1b 100644 --- a/src/AutoPilotPlugins/PX4/CameraComponent.qml +++ b/src/AutoPilotPlugins/PX4/CameraComponent.qml @@ -147,6 +147,7 @@ QGCView { color: palette.text height: ScreenTools.defaultFontPixelWidth * 10 width: ScreenTools.defaultFontPixelWidth * 20 + sourceSize.width: width mipmap: true fillMode: Image.PreserveAspectFit source: "/qmlimages/CameraTrigger.svg" diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 5b1c75dfeda153f0a76689140e7b9872b7280263..c0f78bc7736e69c14aeed6cdbdf1065cd8c9d537 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -201,6 +201,7 @@ QGCView { x: voltageCol.firstColumnWidth + textEditWidth + (ScreenTools.defaultFontPixelWidth * 3) width: height * 0.75 height: voltageCol.height + sourceSize.height: height fillMode: Image.PreserveAspectFit smooth: true color: palette.text diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.qml b/src/AutoPilotPlugins/PX4/SafetyComponent.qml index 24e300630ee7b5afd044fb3e094b534525f4641a..6fe216796add2c4e74ae2aebdc878709e5c05cb9 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -89,6 +89,7 @@ QGCView { Image { height: ScreenTools.defaultFontPixelWidth * 6 width: ScreenTools.defaultFontPixelWidth * 20 + sourceSize.width: width mipmap: true fillMode: Image.PreserveAspectFit source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/LowBatteryLight.svg" : "/qmlimages/LowBattery.svg" @@ -160,6 +161,7 @@ QGCView { Image { height: ScreenTools.defaultFontPixelWidth * 6 width: ScreenTools.defaultFontPixelWidth * 20 + sourceSize.width: width mipmap: true fillMode: Image.PreserveAspectFit source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/RCLossLight.svg" : "/qmlimages/RCLoss.svg" @@ -217,6 +219,7 @@ QGCView { Image { height: ScreenTools.defaultFontPixelWidth * 6 width: ScreenTools.defaultFontPixelWidth * 20 + sourceSize.width: width mipmap: true fillMode: Image.PreserveAspectFit source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/DatalinkLossLight.svg" : "/qmlimages/DatalinkLoss.svg" @@ -274,6 +277,7 @@ QGCView { Image { height: ScreenTools.defaultFontPixelWidth * 8 width: ScreenTools.defaultFontPixelWidth * 20 + sourceSize.width: width mipmap: true fillMode: Image.PreserveAspectFit source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/GeoFenceLight.svg" : "/qmlimages/GeoFence.svg" @@ -357,6 +361,7 @@ QGCView { color: palette.text height: ScreenTools.defaultFontPixelWidth * 10 width: ScreenTools.defaultFontPixelWidth * 20 + sourceSize.width: width mipmap: true fillMode: Image.PreserveAspectFit source: controller.fixedWing ? "/qmlimages/ReturnToHomeAltitude.svg" : "/qmlimages/ReturnToHomeAltitudeCopter.svg" @@ -469,8 +474,9 @@ QGCView { } QGCColoredImage { color: palette.text - height: ScreenTools.defaultFontPixelWidth * 10 + height: ScreenTools.defaultFontPixelWidth * 13 width: ScreenTools.defaultFontPixelWidth * 20 + sourceSize.width: width mipmap: true fillMode: Image.PreserveAspectFit source: controller.fixedWing ? "/qmlimages/LandMode.svg" : "/qmlimages/LandModeCopter.svg" diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml index 6022d8acb7ace90a64508c2d77d4b73011ddffc1..c14f493ebb0a9f5e7bb772a924ebefc6508f61f9 100644 --- a/src/FlightDisplay/FlightDisplayViewVideo.qml +++ b/src/FlightDisplay/FlightDisplayViewVideo.qml @@ -45,7 +45,7 @@ Item { text: qsTr("NO VIDEO") font.family: ScreenTools.demiboldFontFamily color: "white" - font.pointSize: _mainIsMap ? 12 * ScreenTools.fontHRatio : 20 * ScreenTools.fontHRatio + font.pointSize: _mainIsMap ? ScreenTools.smallFontPointSize : ScreenTools.largeFontPointSize anchors.centerIn: parent } } diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index a12b934e7a543dd9ec084c514f1b6e5790101f3b..b9db30ab7ba61a746219d2a9a5b9cd9e6c926221 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -123,7 +123,7 @@ Item { anchors.top: parent.top anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right visible: QGroundControl.virtualTabletJoystick - width: getGadgetWidth() + width: ScreenTools.isTinyScreen ? getGadgetWidth() * 2 : getGadgetWidth() active: _activeVehicle != null heading: _heading rollAngle: _roll diff --git a/src/FlightMap/MapItems/VehicleMapItem.qml b/src/FlightMap/MapItems/VehicleMapItem.qml index b29559707f801168b3a2eaaa20ea2d73120921a2..0a78578d7a3e2a0e62b750722653a3f0a0594c6a 100644 --- a/src/FlightMap/MapItems/VehicleMapItem.qml +++ b/src/FlightMap/MapItems/VehicleMapItem.qml @@ -42,16 +42,16 @@ MapQuickItem { visible: vehicle && vehicle.coordinateValid sourceItem: Image { - id: vehicleIcon - source: isSatellite ? "/qmlimages/airplaneOpaque.svg" : "/qmlimages/airplaneOutline.svg" - mipmap: true - width: size - fillMode: Image.PreserveAspectFit - + id: vehicleIcon + source: isSatellite ? "/qmlimages/airplaneOpaque.svg" : "/qmlimages/airplaneOutline.svg" + mipmap: true + width: size + sourceSize.width: size + fillMode: Image.PreserveAspectFit transform: Rotation { - origin.x: vehicleIcon.width / 2 - origin.y: vehicleIcon.height / 2 - angle: vehicle ? vehicle.heading.value : 0 + origin.x: vehicleIcon.width / 2 + origin.y: vehicleIcon.height / 2 + angle: vehicle ? vehicle.heading.value : 0 } } } diff --git a/src/FlightMap/Widgets/QGCAttitudeHUD.qml b/src/FlightMap/Widgets/QGCAttitudeHUD.qml index 7354720d1b89ae2ddb327376e2daa58d7a9a5151..dc0c2d9ec6bfe7797e11d796bad98eb84203635c 100644 --- a/src/FlightMap/Widgets/QGCAttitudeHUD.qml +++ b/src/FlightMap/Widgets/QGCAttitudeHUD.qml @@ -48,25 +48,27 @@ Item { Image { id: rollDial - anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter} - source: "/qmlimages/rollDialWhite.svg" - mipmap: true - width: parent.width - fillMode: Image.PreserveAspectFit + anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter } + source: "/qmlimages/rollDialWhite.svg" + mipmap: true + width: parent.width + sourceSize.width: width + fillMode: Image.PreserveAspectFit transform: Rotation { - origin.x: rollDial.width / 2 - origin.y: rollDial.height - angle: -_rollAngle + origin.x: rollDial.width / 2 + origin.y: rollDial.height + angle: -_rollAngle } } Image { id: pointer - anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter} - source: "/qmlimages/rollPointerWhite.svg" - mipmap: true - width: rollDial.width - fillMode: Image.PreserveAspectFit + anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter } + source: "/qmlimages/rollPointerWhite.svg" + mipmap: true + width: rollDial.width + sourceSize.width: width + fillMode: Image.PreserveAspectFit } Image { @@ -75,6 +77,7 @@ Item { source: "/qmlimages/crossHair.svg" mipmap: true width: parent.width + sourceSize.width: width fillMode: Image.PreserveAspectFit } diff --git a/src/FlightMap/Widgets/QGCAttitudeWidget.qml b/src/FlightMap/Widgets/QGCAttitudeWidget.qml index d6e488bd2bf2391b5ce0be57c543414d7dd7d4c2..542b8fd5c0cdd1c7f02ebe1849c4c63a4d29d2cc 100644 --- a/src/FlightMap/Widgets/QGCAttitudeWidget.qml +++ b/src/FlightMap/Widgets/QGCAttitudeWidget.qml @@ -58,31 +58,33 @@ Item { //---------------------------------------------------- //-- Artificial Horizon QGCArtificialHorizon { - rollAngle: _rollAngle - pitchAngle: _pitchAngle - anchors.fill: parent + rollAngle: _rollAngle + pitchAngle: _pitchAngle + anchors.fill: parent } //---------------------------------------------------- //-- Pointer Image { - id: pointer - source: "/qmlimages/attitudePointer.svg" - mipmap: true - fillMode: Image.PreserveAspectFit - anchors.fill: parent + id: pointer + source: "/qmlimages/attitudePointer.svg" + mipmap: true + fillMode: Image.PreserveAspectFit + anchors.fill: parent + sourceSize.height: parent.height } //---------------------------------------------------- //-- Instrument Dial Image { - id: instrumentDial - source: "/qmlimages/attitudeDial.svg" - mipmap: true - fillMode: Image.PreserveAspectFit - anchors.fill: parent + id: instrumentDial + source: "/qmlimages/attitudeDial.svg" + mipmap: true + fillMode: Image.PreserveAspectFit + anchors.fill: parent + sourceSize.height: parent.height transform: Rotation { - origin.x: root.width / 2 - origin.y: root.height / 2 - angle: -_rollAngle + origin.x: root.width / 2 + origin.y: root.height / 2 + angle: -_rollAngle } } //---------------------------------------------------- @@ -104,6 +106,7 @@ Item { source: "/qmlimages/crossHair.svg" mipmap: true width: size * 0.75 + sourceSize.width: width fillMode: Image.PreserveAspectFit } } diff --git a/src/FlightMap/Widgets/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml index 4b12745f72f834bc85d1b291b0125b3a0e77125f..fb331ac7468fc7995ec46510f804348cd46f970a 100644 --- a/src/FlightMap/Widgets/QGCCompassWidget.qml +++ b/src/FlightMap/Widgets/QGCCompassWidget.qml @@ -64,6 +64,7 @@ Item { source: "/qmlimages/compassInstrumentAirplane.svg" mipmap: true width: size * 0.75 + sourceSize.width: width fillMode: Image.PreserveAspectFit anchors.centerIn: parent transform: Rotation { @@ -79,6 +80,7 @@ Item { mipmap: true fillMode: Image.PreserveAspectFit anchors.fill: parent + sourceSize.height: parent.height } Rectangle { diff --git a/src/FlightMap/Widgets/QGCInstrumentWidget.qml b/src/FlightMap/Widgets/QGCInstrumentWidget.qml index d7a2075a5970e8ec68c042347cdc27ece458afa6..86f96b9f7fa053081db15bf2dfc73c0d08ee3db3 100644 --- a/src/FlightMap/Widgets/QGCInstrumentWidget.qml +++ b/src/FlightMap/Widgets/QGCInstrumentWidget.qml @@ -108,8 +108,8 @@ Item { mipmap: true opacity: 0.5 width: attitudeWidget.width * 0.15 + sourceSize.width: width fillMode: Image.PreserveAspectFit - MouseArea { anchors.fill: parent hoverEnabled: true diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index f80a77411539cfa12a01948abc3eebd47a40f803..45e91b80b7fbf05ec91470b3304e80ef3b62729e 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -698,7 +698,6 @@ QGCView { buttonImage: "/qmlimages/ZoomMinus.svg" z: QGroundControl.zOrderWidgets lightBorders: _lightWidgetBorders - onClicked: { if(editorMap) editorMap.zoomLevel -= 0.5 diff --git a/src/QmlControls/DropButton.qml b/src/QmlControls/DropButton.qml index d01f57aaefc4c0d737056930eb9f6b2330babc7c..6092fd657d365016cd3cb6805a883a114f14cec5 100644 --- a/src/QmlControls/DropButton.qml +++ b/src/QmlControls/DropButton.qml @@ -11,7 +11,7 @@ Item { signal clicked() property alias buttonImage: roundButton.buttonImage property alias rotateImage: roundButton.rotateImage - property real radius: ScreenTools.defaultFontPixelHeight * 1.5 + property real radius: ScreenTools.defaultFontPixelHeight * 1.25 property int dropDirection: dropDown property alias dropDownComponent: dropDownLoader.sourceComponent property real viewportMargins: 0 @@ -160,7 +160,6 @@ Item { RoundButton { id: roundButton radius: parent.width / 2 - onClicked: { _root.clicked() } diff --git a/src/QmlControls/MissionItemEditor.qml b/src/QmlControls/MissionItemEditor.qml index 80400b00b9560f906d45b932b487c6baeb40cfeb..214c9b0b0d764d435a83a4d67b2af1289a78b08e 100644 --- a/src/QmlControls/MissionItemEditor.qml +++ b/src/QmlControls/MissionItemEditor.qml @@ -62,6 +62,7 @@ Rectangle { anchors.verticalCenter: commandPicker.verticalCenter width: commandPicker.height height: commandPicker.height + sourceSize.height: height source: "qrc:/qmlimages/Hamburger.svg" visible: missionItem.isCurrentItem && missionItem.sequenceNumber != 0 diff --git a/src/QmlControls/OfflineMapButton.qml b/src/QmlControls/OfflineMapButton.qml index ca819323bd78bef74c3ea925fd58bf265778d065..e0c781571dfa97294794a0c789dc9a6e9e523655 100644 --- a/src/QmlControls/OfflineMapButton.qml +++ b/src/QmlControls/OfflineMapButton.qml @@ -60,6 +60,7 @@ Rectangle QGCColoredImage { width: sizeLabel.height * 0.8 height: sizeLabel.height * 0.8 + sourceSize.height: height source: "/res/buttonRight.svg" mipmap: true fillMode: Image.PreserveAspectFit diff --git a/src/QmlControls/QGCPipable.qml b/src/QmlControls/QGCPipable.qml index 74284986c116c490b1000da6d572431abcb53925..0199c346e60eb4603480617569f76a19c4e0b394 100644 --- a/src/QmlControls/QGCPipable.qml +++ b/src/QmlControls/QGCPipable.qml @@ -57,6 +57,7 @@ Item { visible: !isHidden height: ScreenTools.defaultFontPixelHeight * 2.5 width: ScreenTools.defaultFontPixelHeight * 2.5 + sourceSize.height: height MouseArea { anchors.fill: parent onClicked: { @@ -78,6 +79,7 @@ Item { Image { width: parent.width * 0.75 height: parent.height * 0.75 + sourceSize.height: height source: "/res/buttonRight.svg" mipmap: true fillMode: Image.PreserveAspectFit diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml index b40c491e235ab971c9dbcb76abbc61c1ae5ce1e3..6bafc0f1302381590696c0108892f09993841b34 100644 --- a/src/QmlControls/QGCToolBarButton.qml +++ b/src/QmlControls/QGCToolBarButton.qml @@ -55,6 +55,7 @@ Item { anchors.bottomMargin: _topBottomMargins anchors.top: parent.top anchors.bottom: parent.bottom + sourceSize.height: parent.height fillMode: Image.PreserveAspectFit color: checked ? qgcPal.buttonHighlight : qgcPal.buttonText } @@ -63,7 +64,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - height: _topBottomMargins / 3 + height: _topBottomMargins * 0.25 color: qgcPal.buttonHighlight visible: checked } diff --git a/src/QmlControls/RoundButton.qml b/src/QmlControls/RoundButton.qml index 005067a50939a971fabfd832ccf5983dda033305..a4308461ee3265279131ac0f10bfaa29423ba034 100644 --- a/src/QmlControls/RoundButton.qml +++ b/src/QmlControls/RoundButton.qml @@ -10,7 +10,7 @@ Item { signal clicked() property alias buttonImage: button.source - property real radius: ScreenTools.defaultFontPixelHeight * 1.5 + property real radius: ScreenTools.defaultFontPixelHeight * 1.25 property bool rotateImage: false property bool lightBorders: true @@ -45,12 +45,13 @@ Item { color: checked ? qgcPal.buttonHighlight : qgcPal.button QGCColoredImage { - id: button - anchors.fill: parent - fillMode: Image.PreserveAspectFit - mipmap: true - smooth: true - color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText + id: button + anchors.fill: parent + sourceSize.height: parent.height + fillMode: Image.PreserveAspectFit + mipmap: true + smooth: true + color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText RotationAnimation on rotation { id: imageRotation diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index 99ae0f6ddd25c295c253f3a5966cd7ccd1fd41ae..f9dc6bd45d1e341f7be9fabc333b79d84a17deb2 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -13,20 +13,18 @@ Item { property real availableHeight: 0 - property real defaultFontPointSize: 1 - property real defaultFontPixelHeight: 1 - property real defaultFontPixelWidth: 1 - property real smallFontPointSize: 1 - property real mediumFontPointSize: 1 - property real largeFontPointSize: 1 + //-- These are computed at runtime + property real defaultFontPointSize: 10 + property real defaultFontPixelHeight: 10 + property real defaultFontPixelWidth: 10 + property real smallFontPointSize: 10 + property real mediumFontPointSize: 10 + property real largeFontPointSize: 10 readonly property real smallFontPointRatio: 0.75 readonly property real mediumFontPointRatio: 1.25 readonly property real largeFontPointRatio: 1.5 - // Font scaling based on system font - readonly property real fontHRatio: _textMeasure.fontHeight / _defaultFont.fontHeight - property bool isAndroid: ScreenToolsController.isAndroid property bool isiOS: ScreenToolsController.isiOS property bool isMobile: ScreenToolsController.isMobile @@ -68,9 +66,12 @@ Item { return 14; } } else { - //-- Linux and Mac OS we use a slightly smaller font - if(ScreenToolsController.isMacOS || ScreenToolsController.isLinux) + //-- Mac OS + if(ScreenToolsController.isMacOS) return _defaultFont.font.pointSize - 1 + //-- Linux + if(ScreenToolsController.isLinux) + return _defaultFont.font.pointSize - 3.25 else return _defaultFont.font.pointSize } diff --git a/src/QmlControls/SliderSwitch.qml b/src/QmlControls/SliderSwitch.qml index 2bc9ef84333d070d7ae2181ba0a8e1cc98f79696..05580810023c95ecfdbb1694bd4cb80b689b5105 100644 --- a/src/QmlControls/SliderSwitch.qml +++ b/src/QmlControls/SliderSwitch.qml @@ -43,6 +43,7 @@ Rectangle { anchors.centerIn: parent width: parent.width * 0.8 height: parent.height * 0.8 + sourceSize.height: height fillMode: Image.PreserveAspectFit smooth: false mipmap: false diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index 4d4538b13205b3f06d330ce2c93b98c89894ec92..640458cebe182dbf142621aabc27445b8ebbd839 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -14,7 +14,7 @@ Button { text: "Button" ///< Pass in your own button text checkable: true - implicitHeight: ScreenTools.defaultFontPixelHeight * 2.5 + implicitHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 3.5 : ScreenTools.defaultFontPixelHeight * 2.5 style: ButtonStyle { id: buttonStyle diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index 70607cb92d83f4e1b755edacf7a46ca3d77dfaf1..12b7ce6eeac09b91072388b4dc38bfebec160e6e 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -267,7 +267,6 @@ Rectangle { center: QGroundControl.defaultMapPosition visible: false gesture.flickDeceleration: 3000 - gesture.activeGestures: MapGestureArea.ZoomGesture | MapGestureArea.PanGesture | MapGestureArea.FlickGesture plugin: Plugin { name: "QGroundControl" } Rectangle { diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index cdf5432afe07f005e6cc4d1b1a71409874c1d848..d6a75379a34a08a8399267265e9c7351472706e1 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -39,7 +39,7 @@ Rectangle { anchors.leftMargin: ScreenTools.defaultFontPixelWidth color: qgcPal.window - property real _minSummaryW: ScreenTools.defaultFontPixelWidth * 36 + property real _minSummaryW: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 28 : ScreenTools.defaultFontPixelWidth * 36 property real _summaryBoxWidth: _minSummaryW property real _summaryBoxSpace: ScreenTools.defaultFontPixelWidth * 2 diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml index b65b7fd1b4f63022d31c51b393244ee18825e9f5..7a8523b2f90d9ecca2eb196d2e944c6bab4ca58a 100644 --- a/src/ui/MainWindowInner.qml +++ b/src/ui/MainWindowInner.qml @@ -45,7 +45,7 @@ Item { QGCPalette { id: qgcPal; colorGroupEnabled: true } - property real tbHeight: ScreenTools.isMobile ? (ScreenTools.isTinyScreen ? (mainWindow.width * 0.0666) : (mainWindow.width * 0.05)) : ScreenTools.defaultFontPixelHeight * 4 + property real tbHeight: ScreenTools.isMobile ? (ScreenTools.isTinyScreen ? (mainWindow.width * 0.0666) : (mainWindow.width * 0.05)) : ScreenTools.defaultFontPixelHeight * 3 property int tbCellHeight: tbHeight * 0.75 property real tbSpacing: ScreenTools.isMobile ? width * 0.00824 : 9.54 property real tbButtonWidth: tbCellHeight * 1.35 @@ -383,6 +383,7 @@ Item { anchors.right: parent.right width: ScreenTools.defaultFontPixelHeight * 1.5 height: width + sourceSize.height: height source: "/res/XDelete.svg" fillMode: Image.PreserveAspectFit mipmap: true @@ -418,7 +419,7 @@ Item { } width: mainWindow.width * 0.55 - height: ScreenTools.defaultFontPixelHeight * ScreenTools.fontHRatio * 6 + height: ScreenTools.defaultFontPixelHeight * 6 color: qgcPal.window visible: false radius: ScreenTools.defaultFontPixelHeight * 0.5 @@ -467,6 +468,7 @@ Item { anchors.right: parent.right width: ScreenTools.defaultFontPixelHeight * 1.5 height: width + sourceSize.height: height source: "/res/XDelete.svg" fillMode: Image.PreserveAspectFit color: qgcPal.warningText @@ -485,6 +487,7 @@ Item { anchors.right: parent.right width: ScreenTools.defaultFontPixelHeight * 1.5 height: ScreenTools.defaultFontPixelHeight * 1.5 + sourceSize.height: height source: "/res/ArrowDown.svg" fillMode: Image.PreserveAspectFit visible: criticalMessageText.lineCount > 5 diff --git a/src/ui/MainWindowLeftPanel.qml b/src/ui/MainWindowLeftPanel.qml index f48daebde15f6a4cc8421c071d1c35d239c7f862..55264942ba43383ec906a4c36d9817a3609ad790 100644 --- a/src/ui/MainWindowLeftPanel.qml +++ b/src/ui/MainWindowLeftPanel.qml @@ -41,8 +41,9 @@ Item { property alias animateHideDialog: __animateHideDialog readonly property int __animationDuration: 100 - readonly property real __closeButtonSize: ScreenTools.defaultFontPixelHeight * 2 - readonly property real _margins: ScreenTools.defaultFontPixelHeight / 2 + readonly property real __closeButtonSize: ScreenTools.defaultFontPixelHeight * 1.5 + readonly property real _margins: ScreenTools.defaultFontPixelHeight * 0.5 + readonly property real _buttonHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 3 : ScreenTools.defaultFontPixelHeight * 2 QGCPalette { id: qgcPal } @@ -163,7 +164,7 @@ Item { } QGCButton { - height: ScreenTools.defaultFontPixelHeight * 2 + height: _buttonHeight anchors.left: parent.left anchors.right: parent.right text: qsTr("General") @@ -177,7 +178,7 @@ Item { } QGCButton { - height: ScreenTools.defaultFontPixelHeight * 2 + height: _buttonHeight anchors.left: parent.left anchors.right: parent.right text: qsTr("Comm Links") @@ -191,7 +192,7 @@ Item { } QGCButton { - height: ScreenTools.defaultFontPixelHeight * 2 + height: _buttonHeight anchors.left: parent.left anchors.right: parent.right text: qsTr("Offline Maps") @@ -205,7 +206,7 @@ Item { } QGCButton { - height: ScreenTools.defaultFontPixelHeight * 2 + height: _buttonHeight anchors.left: parent.left anchors.right: parent.right text: qsTr("MavLink") @@ -219,7 +220,7 @@ Item { } QGCButton { - height: ScreenTools.defaultFontPixelHeight * 2 + height: _buttonHeight anchors.left: parent.left anchors.right: parent.right text: qsTr("Console") @@ -233,7 +234,7 @@ Item { } QGCButton { - height: ScreenTools.defaultFontPixelHeight * 2 + height: _buttonHeight anchors.left: parent.left anchors.right: parent.right text: qsTr("Mock Link") @@ -248,7 +249,7 @@ Item { } QGCButton { - height: ScreenTools.defaultFontPixelHeight * 2 + height: _buttonHeight anchors.left: parent.left anchors.right: parent.right text: qsTr("Debug") @@ -316,6 +317,7 @@ Item { color: qgcPal.text width: parent.width * 0.75 height: parent.height * 0.75 + sourceSize.height: height anchors.centerIn: parent } MouseArea { diff --git a/src/ui/preferences/DebugWindow.qml b/src/ui/preferences/DebugWindow.qml index 3d8a5bec23e6ac1f310e7e9de2891f2a37b69b6f..d003ddf449c8b01ead427024470a04d77b1ebfc1 100644 --- a/src/ui/preferences/DebugWindow.qml +++ b/src/ui/preferences/DebugWindow.qml @@ -54,7 +54,7 @@ QGCView { anchors.margins: 20 anchors.top: parent.top anchors.left: parent.left - columns: 2 + columns: 3 Text { text: qsTr("Qt Platform:") color: qgcPal.text @@ -65,6 +65,12 @@ QGCView { color: qgcPal.text font.family: ScreenTools.normalFontFamily } + Text { + text: qsTr("Font Point Size 10") + color: qgcPal.text + font.pointSize: 10 + font.family: ScreenTools.normalFontFamily + } Text { text: qsTr("Default font width:") color: qgcPal.text @@ -75,6 +81,12 @@ QGCView { color: qgcPal.text font.family: ScreenTools.normalFontFamily } + Text { + text: qsTr("Font Point Size 10.5") + color: qgcPal.text + font.pointSize: 10.5 + font.family: ScreenTools.normalFontFamily + } Text { text: qsTr("Default font height:") color: qgcPal.text @@ -85,6 +97,12 @@ QGCView { color: qgcPal.text font.family: ScreenTools.normalFontFamily } + Text { + text: qsTr("Font Point Size 11") + color: qgcPal.text + font.pointSize: 11 + font.family: ScreenTools.normalFontFamily + } Text { text: qsTr("Default font pixel size:") color: qgcPal.text @@ -95,6 +113,12 @@ QGCView { color: qgcPal.text font.family: ScreenTools.normalFontFamily } + Text { + text: qsTr("Font Point Size 11.5") + color: qgcPal.text + font.pointSize: 11.5 + font.family: ScreenTools.normalFontFamily + } Text { text: qsTr("Default font point size:") color: qgcPal.text @@ -105,6 +129,12 @@ QGCView { color: qgcPal.text font.family: ScreenTools.normalFontFamily } + Text { + text: qsTr("Font Point Size 12") + color: qgcPal.text + font.pointSize: 12 + font.family: ScreenTools.normalFontFamily + } Text { text: qsTr("QML Screen Desktop:") color: qgcPal.text @@ -115,6 +145,12 @@ QGCView { color: qgcPal.text font.family: ScreenTools.normalFontFamily } + Text { + text: qsTr("Font Point Size 12.5") + color: qgcPal.text + font.pointSize: 12.5 + font.family: ScreenTools.normalFontFamily + } Text { text: qsTr("QML Screen Size:") color: qgcPal.text @@ -126,23 +162,73 @@ QGCView { font.family: ScreenTools.normalFontFamily } Text { - text: qsTr("QML Pixel Density:") + text: qsTr("Font Point Size 13") color: qgcPal.text + font.pointSize: 13 font.family: ScreenTools.normalFontFamily } Text { - text: Screen.pixelDensity + text: qsTr("QML Pixel Density:") color: qgcPal.text font.family: ScreenTools.normalFontFamily } Text { - text: qsTr("QML Pixel Ratio:") + text: Screen.pixelDensity.toFixed(4) color: qgcPal.text font.family: ScreenTools.normalFontFamily } Text { - text: Screen.devicePixelRatio + text: qsTr("Font Point Size 13.5") color: qgcPal.text + font.pointSize: 13.5 + font.family: ScreenTools.normalFontFamily + } + Text { + text: qsTr("QML Pixel Ratio:") + color: qgcPal.text + font.family: ScreenTools.normalFontFamily + } + Text { + text: Screen.devicePixelRatio + color: qgcPal.text + font.family: ScreenTools.normalFontFamily + } + Text { + text: qsTr("Font Point Size 14") + color: qgcPal.text + font.pointSize: 14 + font.family: ScreenTools.normalFontFamily + } + Text { + text: qsTr("Default Point:") + color: qgcPal.text + font.family: ScreenTools.normalFontFamily + } + Text { + text: ScreenTools.defaultFontPointSize + color: qgcPal.text + font.family: ScreenTools.normalFontFamily + } + Text { + text: qsTr("Font Point Size 14.5") + color: qgcPal.text + font.pointSize: 14.5 + font.family: ScreenTools.normalFontFamily + } + Text { + text: qsTr("Computed Font Height:") + color: qgcPal.text + font.family: ScreenTools.normalFontFamily + } + Text { + text: ScreenTools.defaultFontPixelHeight + color: qgcPal.text + font.family: ScreenTools.normalFontFamily + } + Text { + text: qsTr("Font Point Size 15") + color: qgcPal.text + font.pointSize: 15 font.family: ScreenTools.normalFontFamily } } diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index f486b68d8ca611722faff06dc3552d0eed710a39..e1dc92657b7072aee29fac5d879b084fbe95f3aa 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -51,93 +51,6 @@ Rectangle { property bool isBackgroundDark: true property bool opaqueBackground: false - /* - Dev System (Mac OS) - - qml: Main Window Width: 1008 - qml: Toolbar height: 51.2 - qml: Default font: 12.8 - qml: Font (.75): 9.600000000000001 - qml: Font (.85): 10.88 - qml: Font 1.5): 19.200000000000003 - qml: Default Font Width: 8.328125 - qml: Default Font Height: 12.8 - qml: -- - qml: Real Font Height: 16 - qml: fontHRatio: 1 - qml: -- - qml: cellHeight: 38 - qml: tbFontSmall: 10 - qml: tbFontNormal: 12 - qml: tbFontLarge: 18 - qml: tbSpacing: 9.54 - - Nexus 9 - - qml: Main Window Width: 2048 - qml: Toolbar height: 90.9312 - qml: Default font: 38 - qml: Font (.75): 28.5 - qml: Font (.85): 32.3 - qml: Font 1.5): 57 - qml: Default Font Width: 20.0625 - qml: Default Font Height: 38 - qml: -- - qml: Real Font Height: 38 - qml: fontHRatio: 2.375 - qml: -- - qml: cellHeight: 68 - qml: tbFontSmall: 23.75 - qml: tbFontNormal: 28.5 - qml: tbFontLarge: 42.75 - qml: tbSpacing: 16.87552 - - Nexus 7 - - qml: Main Window Width: 1920 - qml: Toolbar height: 85.248 - qml: Default font: 38 - qml: Font (.75): 28.5 - qml: Font (.85): 32.3 - qml: Font 1.5): 57 - qml: Default Font Width: 20.140625 - qml: Default Font Height: 38 - qml: -- - qml: Real Font Height: 38 - qml: fontHRatio: 2.375 - qml: -- - qml: cellHeight: 63 - qml: tbFontSmall: 23.75 - qml: tbFontNormal: 28.5 - qml: tbFontLarge: 42.75 - qml: tbSpacing: 15.820800000000002 - - Nexus 4 - - qml: Main Window Width: 1196 - qml: Toolbar height: 79.65360000000001 - qml: Default font: 38 - qml: Font (.75): 28.5 - qml: Font (.85): 32.3 - qml: Font 1.5): 57 - qml: Default Font Width: 20.140625 - qml: Default Font Height: 38 - qml: -- - qml: Real Font Height: 38 - qml: fontHRatio: 2.375 - qml: -- - qml: cellHeight: 59 - qml: tbFontSmall: 23.75 - qml: tbFontNormal: 28.5 - qml: tbFontLarge: 42.75 - qml: tbSpacing: 9.85504 - - */ - - readonly property real tbFontSmall: 8 * ScreenTools.fontHRatio - readonly property real tbFontNormal: 12 * ScreenTools.fontHRatio - readonly property real tbFontLarge: 18 * ScreenTools.fontHRatio - readonly property var colorGreen: "#05f068" readonly property var colorOrange: "#f0ab06" readonly property var colorRed: "#fc4638" @@ -503,7 +416,7 @@ Rectangle { QGCLabel { id: connectionLost text: qsTr("COMMUNICATION LOST") - font.pointSize: tbFontLarge + font.pointSize: ScreenTools.largeFontPointSize font.family: ScreenTools.demiboldFontFamily color: colorRed anchors.rightMargin: ScreenTools.defaultFontPixelWidth diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml index 924af5acfbf2847d39ce6a020ec0ffd0ec6f6316..cb31533090c5c2956612f6c64925f7d600d069e8 100644 --- a/src/ui/toolbar/MainToolBarIndicators.qml +++ b/src/ui/toolbar/MainToolBarIndicators.qml @@ -37,6 +37,7 @@ Row { QGCPalette { id: qgcPal } + //------------------------------------------------------------------------- function getSatStrength(hdop) { if (hdop <= 1.0) return 100 @@ -49,6 +50,7 @@ Row { return 0 } + //------------------------------------------------------------------------- function getMessageColor() { if (activeVehicle) { if (activeVehicle.messageTypeNone) @@ -67,6 +69,7 @@ Row { return "white"; } + //------------------------------------------------------------------------- function getBatteryVoltageText() { if (activeVehicle.battery.voltage.value >= 0) { return activeVehicle.battery.voltage.valueString + activeVehicle.battery.voltage.units @@ -74,6 +77,7 @@ Row { return 'N/A'; } + //------------------------------------------------------------------------- function getBatteryPercentageText() { if(activeVehicle) { if(activeVehicle.battery.percentRemaining.value > 98.9) { @@ -97,29 +101,26 @@ Row { height: mainWindow.tbCellHeight visible: activeVehicle && activeVehicle.messageCount anchors.verticalCenter: parent.verticalCenter - Item { id: criticalMessage anchors.fill: parent visible: activeVehicle && activeVehicle.messageCount > 0 && isMessageImportant - Image { - source: "/qmlimages/Yield.svg" - height: mainWindow.tbCellHeight * 0.75 - fillMode: Image.PreserveAspectFit - cache: false - visible: isMessageImportant + source: "/qmlimages/Yield.svg" + height: mainWindow.tbCellHeight * 0.75 + sourceSize.height: height + fillMode: Image.PreserveAspectFit + cache: false + visible: isMessageImportant anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter } - SequentialAnimation { id: loopAnimation loops: Animation.Infinite NumberAnimation { target: criticalMessage; property: "opacity"; duration: 1000; from: 0.25; to: 1 } NumberAnimation { target: criticalMessage; property: "opacity"; duration: 1000; from: 1; to: 0.25 } } - onVisibleChanged: { if(messages.visible) { loopAnimation.start() @@ -128,23 +129,21 @@ Row { } } } - Item { anchors.fill: parent visible: !criticalMessage.visible - QGCColoredImage { id: messageIcon source: "/qmlimages/Megaphone.svg" height: mainWindow.tbCellHeight * 0.5 width: height + sourceSize.height: height fillMode: Image.PreserveAspectFit color: getMessageColor() anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter } } - MouseArea { anchors.fill: parent onClicked: { @@ -160,38 +159,35 @@ Row { width: gpsRow.width * 1.1 height: mainWindow.tbCellHeight Row { - id: gpsRow - height: parent.height - + id: gpsRow + height: parent.height + spacing: ScreenTools.defaultFontPixelWidth QGCColoredImage { id: gpsIcon source: "/qmlimages/Gps.svg" fillMode: Image.PreserveAspectFit width: mainWindow.tbCellHeight * 0.65 height: mainWindow.tbCellHeight * 0.5 + sourceSize.height: height opacity: (activeVehicle && activeVehicle.gps.count.value >= 0) ? 1 : 0.5 color: qgcPal.buttonText anchors.verticalCenter: parent.verticalCenter } - SignalStrength { size: mainWindow.tbCellHeight * 0.5 percent: activeVehicle ? getSatStrength(activeVehicle.gps.hdop.value) : "" anchors.verticalCenter: parent.verticalCenter } } - QGCLabel { anchors.top: parent.top - //anchors.leftMargin: gpsIcon.width - //anchors.left: parent.left - anchors.right: gpsRow.right + anchors.leftMargin: ScreenTools.defaultFontPixelWidth + anchors.horizontalCenter: parent.horizontalCenter visible: activeVehicle && !isNaN(activeVehicle.gps.hdop.value) - font.pointSize: tbFontSmall + font.pointSize: ScreenTools.smallFontPointSize color: qgcPal.buttonText text: activeVehicle ? activeVehicle.gps.hdop.value.toFixed(0) : "" } - MouseArea { anchors.fill: parent onClicked: { @@ -207,28 +203,26 @@ Row { id: rcRssi width: rssiRow.width * 1.1 height: mainWindow.tbCellHeight - Row { - id: rssiRow - height: parent.height - + id: rssiRow + height: parent.height + spacing: ScreenTools.defaultFontPixelWidth QGCColoredImage { width: mainWindow.tbCellHeight * 0.65 - height: mainWindow.tbCellHeight * 0.5 + height: width + sourceSize.height: height source: "/qmlimages/RC.svg" fillMode: Image.PreserveAspectFit opacity: activeVehicle ? (activeVehicle.rcRSSI < 1 ? 0.5 : 1) : 0.5 color: qgcPal.buttonText anchors.verticalCenter: parent.verticalCenter } - SignalStrength { size: mainWindow.tbCellHeight * 0.5 percent: activeVehicle ? activeVehicle.rcRSSI : 0 anchors.verticalCenter: parent.verticalCenter } } - MouseArea { anchors.fill: parent onClicked: { @@ -245,17 +239,16 @@ Row { width: telemIcon.width height: mainWindow.tbCellHeight visible: _controller.telemetryLRSSI < 0 - QGCColoredImage { id: telemIcon height: parent.height * 0.5 + sourceSize.height: height width: height * 1.5 source: "/qmlimages/TelemRSSI.svg" fillMode: Image.PreserveAspectFit color: qgcPal.buttonText anchors.verticalCenter: parent.verticalCenter } - MouseArea { anchors.fill: parent onClicked: { @@ -272,28 +265,26 @@ Row { width: battRow.width * 1.1 height: mainWindow.tbCellHeight opacity: (activeVehicle && activeVehicle.battery.voltage.value >= 0) ? 1 : 0.5 - Row { id: battRow height: mainWindow.tbCellHeight anchors.horizontalCenter: parent.horizontalCenter - QGCColoredImage { height: mainWindow.tbCellHeight * 0.65 + width: height + sourceSize.width: width source: "/qmlimages/Battery.svg" fillMode: Image.PreserveAspectFit - color: qgcPal.buttonText + color: qgcPal.text anchors.verticalCenter: parent.verticalCenter } - QGCLabel { text: getBatteryPercentageText() - font.pointSize: tbFontLarge + font.pointSize: ScreenTools.mediumFontPointSize color: getBatteryColor() anchors.verticalCenter: parent.verticalCenter } } - MouseArea { anchors.fill: parent onClicked: { @@ -375,7 +366,7 @@ Row { QGCLabel { text: activeVehicle ? activeVehicle.flightMode : qsTr("N/A", "No data to display") - font.pointSize: tbFontLarge + font.pointSize: ScreenTools.mediumFontPointSize color: qgcPal.buttonText anchors.verticalCenter: parent.verticalCenter } @@ -430,115 +421,6 @@ Row { } } } - -/* - property var colorOrangeText: (qgcPal.globalTheme === QGCPalette.Light) ? "#b75711" : "#ea8225" - property var colorRedText: (qgcPal.globalTheme === QGCPalette.Light) ? "#ee1112" : "#ef2526" - property var colorGreenText: (qgcPal.globalTheme === QGCPalette.Light) ? "#046b1b" : "#00d930" - property var colorWhiteText: (qgcPal.globalTheme === QGCPalette.Light) ? "#343333" : "#f0f0f0" - - function getRSSIColor(value) { - if(value < 10) - return colorRed; - if(value < 50) - return colorOrange; - return colorGreen; - } - - Rectangle { - id: rssiRC - width: getProportionalDimmension(55) - height: mainWindow.tbCellHeight - visible: _controller.remoteRSSI <= 100 - anchors.verticalCenter: parent.verticalCenter - color: getRSSIColor(_controller.remoteRSSI); - border.color: "#00000000" - border.width: 0 - Image { - source: "qrc:/res/AntennaRC"; - width: mainWindow.tbCellHeight * 0.7 - fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: getProportionalDimmension(6) - mipmap: true - smooth: true - } - QGCLabel { - text: _controller.remoteRSSI - anchors.right: parent.right - anchors.rightMargin: getProportionalDimmension(6) - anchors.verticalCenter: parent.verticalCenter - horizontalAlignment: Text.AlignRight - font.pointSize: ScreenTools.smallFontPointSize - font.family: ScreenTools.demiboldFontFamily - color: colorWhite - } - } - - Rectangle { - id: rssiTelemetry - width: getProportionalDimmension(80) - height: mainWindow.tbCellHeight - visible: (_controller.telemetryRRSSI > 0) && (_controller.telemetryLRSSI > 0) - anchors.verticalCenter: parent.verticalCenter - color: getRSSIColor(Math.min(_controller.telemetryRRSSI,_controller.telemetryLRSSI)); - border.color: "#00000000" - border.width: 0 - Image { - source: "qrc:/res/AntennaT"; - width: mainWindow.tbCellHeight * 0.7 - fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: getProportionalDimmension(6) - mipmap: true - smooth: true - } - Column { - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: getProportionalDimmension(6) - Row { - anchors.right: parent.right - QGCLabel { - text: 'R ' - font.pointSize: ScreenTools.smallFontPointSize - font.family: ScreenTools.demiboldFontFamily - color: colorWhite - } - QGCLabel { - text: _controller.telemetryRRSSI + 'dBm' - width: getProportionalDimmension(30) - horizontalAlignment: Text.AlignRight - font.pointSize: ScreenTools.smallFontPointSize - font.family: ScreenTools.demiboldFontFamily - color: colorWhite - } - } - Row { - anchors.right: parent.right - QGCLabel { - text: 'L ' - font.pointSize: ScreenTools.smallFontPointSize - font.family: ScreenTools.demiboldFontFamily - color: colorWhite - } - QGCLabel { - text: _controller.telemetryLRSSI + 'dBm' - width: getProportionalDimmension(30) - horizontalAlignment: Text.AlignRight - font.pointSize: ScreenTools.smallFontPointSize - font.family: ScreenTools.demiboldFontFamily - color: colorWhite - } - } - } - } - - -*/ - -} // Row +} diff --git a/src/ui/toolbar/SignalStrength.qml b/src/ui/toolbar/SignalStrength.qml index 05b7f8012965cfad4fec6cb66c41a9b8f4e3266e..3604291ff327cb680038fad9384262fdd90f3cb6 100644 --- a/src/ui/toolbar/SignalStrength.qml +++ b/src/ui/toolbar/SignalStrength.qml @@ -57,9 +57,10 @@ Item { } QGCColoredImage { - source: getIcon() - fillMode: Image.PreserveAspectFit - anchors.fill: parent - color: qgcPal.buttonText + source: getIcon() + fillMode: Image.PreserveAspectFit + anchors.fill: parent + color: qgcPal.buttonText + sourceSize.height: size } }