From ac970230c5bc22d5f13a5644dd072a2e384f9d72 Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Thu, 31 Mar 2022 11:49:52 -0700 Subject: [PATCH 1/4] pointSize -> pixelSize. --- .../AdvancedTabComponents/AdvancedImuTab.qml | 12 +++--- .../AdvancedMagnetometerTab.qml | 2 +- .../FusionStatusFlags.qml | 14 +++---- .../MessageBroadcaster.qml | 4 +- .../AdvancedTabComponents/MetricsMonitor.qml | 2 +- .../AdvancedTabComponents/NetworkInfo.qml | 2 +- .../ThreadStateTable.qml | 2 +- resources/BaseComponents/SmallCheckBox.qml | 2 +- resources/BaseComponents/SwiftTextInput.qml | 2 +- resources/BaseComponents/SwiftTextbox.qml | 2 +- .../BaselineTabComponents/BaselinePlot.qml | 4 +- .../BaselineTabComponents/BaselineTable.qml | 2 +- resources/ChartLegend.qml | 2 +- resources/Constants/Constants.qml | 39 +++++++++---------- resources/Constants/Globals.qml | 1 - resources/LogPanel.qml | 4 +- resources/LoggingBar.qml | 6 +-- resources/LogoPopupComponents/AboutMe.qml | 8 ++-- resources/LogoPopupComponents/Licenses.qml | 4 +- .../ObservationTable.qml | 2 +- resources/SettingsTab.qml | 2 +- .../InsSettingsPopup.qml | 2 +- .../SettingsTabComponents/SettingsPane.qml | 10 ++--- .../SettingsTabComponents/SettingsTable.qml | 4 +- resources/SideNavBar.qml | 2 +- .../SideNavBarComponents/SideNavButton.qml | 2 +- .../SolutionPositionTab.qml | 4 +- .../SolutionTabComponents/SolutionTable.qml | 4 +- .../SolutionVelocityTab.qml | 2 +- resources/StatusBar.qml | 4 +- .../TableComponents/SortableColumnHeading.qml | 2 +- resources/TableComponents/SwiftTableView.qml | 2 +- .../TableComponents/TableCellDelegate.qml | 2 +- .../TrackingSkyPlotTab.qml | 14 +++---- resources/UpdateTab.qml | 6 +-- .../FileIOSelectLocalFileAndDestPath.qml | 4 +- .../UpdateTabComponents/FirmwareDownload.qml | 2 +- .../UpdateTabComponents/FirmwareVersion.qml | 2 +- .../SelectFirmwareDownloadDirectory.qml | 2 +- .../UpdateTabComponents/SelectLocalFile.qml | 2 +- resources/qtquickcontrols2.conf | 2 +- resources/styles/SwiftNav/Button.qml | 2 +- resources/styles/SwiftNav/Label.qml | 2 +- resources/styles/SwiftNav/RoundButton.qml | 2 +- resources/styles/SwiftNav/TabButton.qml | 2 +- resources/view.qml | 2 +- swiftnav_console/main.py | 2 - 47 files changed, 100 insertions(+), 104 deletions(-) diff --git a/resources/AdvancedTabComponents/AdvancedImuTab.qml b/resources/AdvancedTabComponents/AdvancedImuTab.qml index 60fed14a1..a63aade69 100644 --- a/resources/AdvancedTabComponents/AdvancedImuTab.qml +++ b/resources/AdvancedTabComponents/AdvancedImuTab.qml @@ -87,7 +87,7 @@ Item { id: label text: modelData - font.pointSize: Constants.smallPointSize + font.pixelSize: Constants.smallPixelSize font.bold: true anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset @@ -197,7 +197,7 @@ Item { clip: true anchors.fill: parent anchors.margins: Constants.advancedImu.textDataBarMargin - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize text: "0.00 C" } @@ -219,7 +219,7 @@ Item { clip: true anchors.fill: parent anchors.margins: Constants.advancedImu.textDataBarMargin - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize text: "0x00" } @@ -241,7 +241,7 @@ Item { clip: true anchors.fill: parent anchors.margins: Constants.advancedImu.textDataBarMargin - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize text: "0.00 g" } @@ -263,7 +263,7 @@ Item { clip: true anchors.fill: parent anchors.margins: Constants.advancedImu.textDataBarMargin - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize text: "0.00 g" } @@ -285,7 +285,7 @@ Item { clip: true anchors.fill: parent anchors.margins: Constants.advancedImu.textDataBarMargin - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize text: "0.00 g" } diff --git a/resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml b/resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml index b6fb6ad5a..ece65e116 100644 --- a/resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml +++ b/resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml @@ -88,7 +88,7 @@ Item { id: label text: modelData - font.pointSize: Constants.smallPointSize + font.pixelSize: Constants.smallPixelSize font.bold: true anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset diff --git a/resources/AdvancedTabComponents/FusionStatusFlags.qml b/resources/AdvancedTabComponents/FusionStatusFlags.qml index b50bb0cd7..c3d257d0f 100644 --- a/resources/AdvancedTabComponents/FusionStatusFlags.qml +++ b/resources/AdvancedTabComponents/FusionStatusFlags.qml @@ -33,7 +33,7 @@ Item { Label { text: Constants.advancedImu.insStatusLabels[0] - font.pointSize: Constants.fusionStatusFlags.labelFontSize + font.pixelSize: Constants.fusionStatusFlags.labelFontSize } UnknownStatus { @@ -58,7 +58,7 @@ Item { Label { text: Constants.advancedImu.insStatusLabels[1] - font.pointSize: Constants.fusionStatusFlags.labelFontSize + font.pixelSize: Constants.fusionStatusFlags.labelFontSize } UnknownStatus { @@ -83,7 +83,7 @@ Item { Label { text: Constants.advancedImu.insStatusLabels[2] - font.pointSize: Constants.fusionStatusFlags.labelFontSize + font.pixelSize: Constants.fusionStatusFlags.labelFontSize } UnknownStatus { @@ -108,7 +108,7 @@ Item { Label { text: Constants.advancedImu.insStatusLabels[3] - font.pointSize: Constants.fusionStatusFlags.labelFontSize + font.pixelSize: Constants.fusionStatusFlags.labelFontSize } UnknownStatus { @@ -133,7 +133,7 @@ Item { Label { text: Constants.advancedImu.insStatusLabels[4] - font.pointSize: Constants.fusionStatusFlags.labelFontSize + font.pixelSize: Constants.fusionStatusFlags.labelFontSize } UnknownStatus { @@ -158,7 +158,7 @@ Item { Label { text: Constants.advancedImu.insStatusLabels[5] - font.pointSize: Constants.fusionStatusFlags.labelFontSize + font.pixelSize: Constants.fusionStatusFlags.labelFontSize } UnknownStatus { @@ -307,7 +307,7 @@ Item { label: Label { text: Constants.fusionStatusFlags.title - font.pointSize: Constants.fusionStatusFlags.titleFontSize + font.pixelSize: Constants.fusionStatusFlags.titleFontSize } } diff --git a/resources/AdvancedTabComponents/MessageBroadcaster.qml b/resources/AdvancedTabComponents/MessageBroadcaster.qml index d5726edf4..4b376c3f7 100644 --- a/resources/AdvancedTabComponents/MessageBroadcaster.qml +++ b/resources/AdvancedTabComponents/MessageBroadcaster.qml @@ -137,7 +137,7 @@ Item { text: "" cursorVisible: true selectByMouse: true - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize font.family: Constants.genericTable.fontFamily anchors.left: parent.left anchors.right: parent.right @@ -207,7 +207,7 @@ Item { text: "" cursorVisible: true selectByMouse: true - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize font.family: Constants.genericTable.fontFamily anchors.left: parent.left anchors.right: parent.right diff --git a/resources/AdvancedTabComponents/MetricsMonitor.qml b/resources/AdvancedTabComponents/MetricsMonitor.qml index 1b6ae6578..f8e3df1d2 100644 --- a/resources/AdvancedTabComponents/MetricsMonitor.qml +++ b/resources/AdvancedTabComponents/MetricsMonitor.qml @@ -55,7 +55,7 @@ Item { elide: Text.ElideRight clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } MouseArea { diff --git a/resources/AdvancedTabComponents/NetworkInfo.qml b/resources/AdvancedTabComponents/NetworkInfo.qml index 6270e95fc..45b276da2 100644 --- a/resources/AdvancedTabComponents/NetworkInfo.qml +++ b/resources/AdvancedTabComponents/NetworkInfo.qml @@ -33,7 +33,7 @@ ColumnLayout { elide: Text.ElideRight clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } MouseArea { diff --git a/resources/AdvancedTabComponents/ThreadStateTable.qml b/resources/AdvancedTabComponents/ThreadStateTable.qml index 7e4ba6907..4edda7303 100644 --- a/resources/AdvancedTabComponents/ThreadStateTable.qml +++ b/resources/AdvancedTabComponents/ThreadStateTable.qml @@ -32,7 +32,7 @@ Item { elide: Text.ElideRight clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } MouseArea { diff --git a/resources/BaseComponents/SmallCheckBox.qml b/resources/BaseComponents/SmallCheckBox.qml index 531496525..e4efbc4f2 100644 --- a/resources/BaseComponents/SmallCheckBox.qml +++ b/resources/BaseComponents/SmallCheckBox.qml @@ -20,7 +20,7 @@ T.CheckBox { font { family: Constants.fontFamily - pointSize: Constants.smallPointSize + pixelSize: Constants.smallPixelSize bold: true } diff --git a/resources/BaseComponents/SwiftTextInput.qml b/resources/BaseComponents/SwiftTextInput.qml index 7fcc8ac22..594554952 100644 --- a/resources/BaseComponents/SwiftTextInput.qml +++ b/resources/BaseComponents/SwiftTextInput.qml @@ -16,7 +16,7 @@ Rectangle { property var fontFamily: Constants.genericTable.fontFamily property font labelFont: Qt.font({ "family": Constants.genericTable.fontFamily, - "pointSize": Constants.largePointSize + "pixelSize": Constants.largePixelSize }) signal textEdited() diff --git a/resources/BaseComponents/SwiftTextbox.qml b/resources/BaseComponents/SwiftTextbox.qml index b184d2727..4fce62e25 100644 --- a/resources/BaseComponents/SwiftTextbox.qml +++ b/resources/BaseComponents/SwiftTextbox.qml @@ -12,7 +12,7 @@ Rectangle { property var fontFamily: Constants.genericTable.fontFamily property font labelFont: Qt.font({ "family": Constants.genericTable.fontFamily, - "pointSize": Constants.largePointSize + "pixelSize": Constants.largePixelSize }) Label { diff --git a/resources/BaselineTabComponents/BaselinePlot.qml b/resources/BaselineTabComponents/BaselinePlot.qml index 5ef32cd3b..026721f51 100644 --- a/resources/BaselineTabComponents/BaselinePlot.qml +++ b/resources/BaselineTabComponents/BaselinePlot.qml @@ -273,7 +273,7 @@ Item { id: marker text: "+ " - font.pointSize: (Constants.mediumPointSize + Constants.commonLegend.markerPointSizeOffset) + font.pixelSize: (Constants.mediumPixelSize + Constants.commonLegend.markerPixelSizeOffset) font.bold: true color: Constants.baselinePlot.colors[index] anchors.verticalCenter: parent.verticalCenter @@ -284,7 +284,7 @@ Item { id: label text: modelData - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize font.bold: true anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset diff --git a/resources/BaselineTabComponents/BaselineTable.qml b/resources/BaselineTabComponents/BaselineTable.qml index 1fa3f9699..3760a9d96 100644 --- a/resources/BaselineTabComponents/BaselineTable.qml +++ b/resources/BaselineTabComponents/BaselineTable.qml @@ -61,7 +61,7 @@ Item { elide: Text.ElideRight clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } MouseArea { diff --git a/resources/ChartLegend.qml b/resources/ChartLegend.qml index 621ce22a5..9f66c812e 100644 --- a/resources/ChartLegend.qml +++ b/resources/ChartLegend.qml @@ -152,7 +152,7 @@ Rectangle { id: legendTextMetrics font.family: Constants.fontFamily - font.pointSize: Constants.xSmallPointSize + font.pixelSize: Constants.xSmallPixelSize text: cellTextSample } diff --git a/resources/Constants/Constants.qml b/resources/Constants/Constants.qml index 564eb6a79..cd7b06138 100644 --- a/resources/Constants/Constants.qml +++ b/resources/Constants/Constants.qml @@ -46,13 +46,12 @@ QtObject { readonly property string fontFamily: "Roboto Condensed" property FontLoader robotoCondensedLightFont readonly property string lightFontFamily: robotoCondensedLightFont.name - readonly property real fontScaleFactor: (Qt.platform.os == "osx" && Globals.useHighDpi) ? 1.5 : 1 - readonly property real xSmallPointSize: fontScaleFactor * 6 - readonly property real smallPointSize: fontScaleFactor * 7 - readonly property real mediumPointSize: fontScaleFactor * 8 - readonly property real largePointSize: fontScaleFactor * 9 - readonly property real xlPointSize: fontScaleFactor * 12 - readonly property real xxlPointSize: fontScaleFactor * 14 + readonly property real xSmallPixelSize: 7 + readonly property real smallPixelSize: 9 + readonly property real mediumPixelSize: 10 + readonly property real largePixelSize: 11 + readonly property real xlPixelSize: 15 + readonly property real xxlPixelSize: 16 readonly property bool debugMode: false readonly property color swiftWhite: "#FFFFFF" readonly property color swiftGrey: "#323F48" @@ -77,7 +76,7 @@ QtObject { readonly property color tabLabelColor: swiftOrange readonly property font tabLabelFont: Qt.font({ "family": "Roboto Condensed", - "pointSize": 20, + "pixelSize": 20, "bold": true, "letterSpacing": 1, "capitalization": Font.AllUppercase @@ -86,7 +85,7 @@ QtObject { readonly property color appNameColor: swiftLightGrey readonly property font appNameFont: Qt.font({ "family": robotoCondensedLightFont.name, - "pointSize": 20, + "pixelSize": 20, "letterSpacing": 2, "capitalization": Font.AllUppercase }) @@ -118,8 +117,8 @@ QtObject { readonly property string supportWebsite: "https://www.swiftnav.com/support" readonly property string website: "https://www.swiftnav.com" readonly property string copyrightText: "Copyright © 2011-2022 Swift Navigation Inc." - readonly property int titlePointSize: 14 - readonly property int secondaryPointSize: 10 + readonly property int titlePixelSize: 14 + readonly property int secondaryPixelSize: 10 } } @@ -284,7 +283,7 @@ QtObject { readonly property color borderColor: "black" readonly property int borderWidth: 0 readonly property color textColor: "black" - readonly property int textPointSize: largePointSize + 1 + readonly property int textPixelSize: largePixelSize + 1 readonly property int keyValueSpacing: 5 readonly property int valueMinimumWidth: 25 readonly property string portLabel: "Port:" @@ -351,7 +350,7 @@ QtObject { readonly property int recordingSizeLabelWidth: 40 readonly property font comboBoxFont: Qt.font({ "family": fontFamily, - "pointSize": mediumPointSize + "pixelSize": mediumPixelSize }) } @@ -539,8 +538,8 @@ QtObject { readonly property int markerWidth: 20 readonly property int topMargin: 85 readonly property int rightMargin: 60 - readonly property real markerPointSizeOffset: 4 - readonly property int labelPointSize: 10 + readonly property real markerPixelSizeOffset: 4 + readonly property int labelPixelSize: 10 readonly property int padding: 10 readonly property int spacing: 5 readonly property int verticalCenterOffset: -1 @@ -566,23 +565,23 @@ QtObject { readonly property color labelsColor: "#000000" readonly property font titleFont: Qt.font({ "family": fontFamily, - "pointSize": xlPointSize, + "pixelSize": xlPixelSize, "bold": true }) readonly property color titleColor: swiftGrey readonly property font axisTitleFont: Qt.font({ "family": fontFamily, - "pointSize": mediumPointSize, + "pixelSize": mediumPixelSize, "bold": true, "letterSpacing": 2, "capitalization": Font.AllUppercase }) readonly property font axisLabelsFont: Qt.font({ "family": fontFamily, - "pointSize": smallPointSize, + "pixelSize": smallPixelSize, "bold": true }) - readonly property int tickPointSize: 10 + readonly property int tickPixelSize: 10 readonly property int buttonHeight: 40 readonly property int unitDropdownWidth: 90 readonly property real zoomInMult: 1.1 @@ -620,7 +619,7 @@ QtObject { readonly property int xAxisTickInterval: 10 readonly property font yAxisTitleFont: Qt.font({ "family": fontFamily, - "pointSize": mediumPointSize, + "pixelSize": mediumPixelSize, "bold": true, "letterSpacing": 2, "capitalization": Font.MixedCase diff --git a/resources/Constants/Globals.qml b/resources/Constants/Globals.qml index f6b5305de..e4741b0ec 100644 --- a/resources/Constants/Globals.qml +++ b/resources/Constants/Globals.qml @@ -6,7 +6,6 @@ QtObject { property int currentRefreshRate: 5 // 5 Hz property bool useOpenGL: false property bool useAntiAliasing: true - property bool useHighDpi: true property bool showPrompts: true property int initialMainTabIndex: 0 // Tracking property int initialSubTabIndex: 0 // Signals diff --git a/resources/LogPanel.qml b/resources/LogPanel.qml index f738968c8..5da39800e 100644 --- a/resources/LogPanel.qml +++ b/resources/LogPanel.qml @@ -130,7 +130,7 @@ Item { contentItem: Label { text: modelData color: logLevelIndex == index ? Constants.swiftOrange : Constants.genericTable.textColor - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize } } @@ -157,7 +157,7 @@ Item { elide: Text.ElideRight clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize Button { id: button diff --git a/resources/LoggingBar.qml b/resources/LoggingBar.qml index ed4ac9db4..1a349cbeb 100644 --- a/resources/LoggingBar.qml +++ b/resources/LoggingBar.qml @@ -79,7 +79,7 @@ Rectangle { visible: false Layout.alignment: Qt.AlignVCenter Layout.topMargin: 6 - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize font.family: Constants.fontFamily font.capitalization: Font.AllUppercase font.bold: true @@ -91,7 +91,7 @@ Rectangle { Layout.minimumWidth: 100 Layout.alignment: Qt.AlignHCenter horizontalAlignment: Text.AlignHCenter - font.pointSize: Constants.xxlPointSize + font.pixelSize: Constants.xxlPixelSize font.family: Constants.lightFontFamily } @@ -110,7 +110,7 @@ Rectangle { Layout.minimumWidth: 100 Layout.alignment: Qt.AlignHCenter horizontalAlignment: Text.AlignHCenter - font.pointSize: Constants.xxlPointSize + font.pixelSize: Constants.xxlPixelSize font.family: Constants.lightFontFamily } diff --git a/resources/LogoPopupComponents/AboutMe.qml b/resources/LogoPopupComponents/AboutMe.qml index d08cc4385..7d702bb10 100644 --- a/resources/LogoPopupComponents/AboutMe.qml +++ b/resources/LogoPopupComponents/AboutMe.qml @@ -20,14 +20,14 @@ ColumnLayout { Label { Layout.alignment: Qt.AlignHCenter text: "Swift Navigation Console " + Globals.consoleVersion - font.pointSize: Constants.logoPopup.aboutMe.titlePointSize + font.pixelSize: Constants.logoPopup.aboutMe.titlePixelSize font.bold: true } Label { Layout.alignment: Qt.AlignHCenter text: Constants.logoPopup.aboutMe.copyrightText - font.pointSize: Constants.logoPopup.aboutMe.secondaryPointSize + font.pixelSize: Constants.logoPopup.aboutMe.secondaryPixelSize } Label { @@ -36,7 +36,7 @@ ColumnLayout { Layout.alignment: Qt.AlignHCenter text: `Find help online at ${websiteDisplay}` - font.pointSize: Constants.logoPopup.aboutMe.secondaryPointSize + font.pixelSize: Constants.logoPopup.aboutMe.secondaryPixelSize onLinkActivated: { Qt.openUrlExternally(website); } @@ -48,7 +48,7 @@ ColumnLayout { Layout.alignment: Qt.AlignHCenter text: `Learn more at ${websiteDisplay}` - font.pointSize: Constants.logoPopup.aboutMe.secondaryPointSize + font.pixelSize: Constants.logoPopup.aboutMe.secondaryPixelSize onLinkActivated: { Qt.openUrlExternally(Constants.logoPopup.aboutMe.website); } diff --git a/resources/LogoPopupComponents/Licenses.qml b/resources/LogoPopupComponents/Licenses.qml index d0b6358c4..a588fa0a3 100644 --- a/resources/LogoPopupComponents/Licenses.qml +++ b/resources/LogoPopupComponents/Licenses.qml @@ -35,7 +35,7 @@ ColumnLayout { selectByKeyboard: true selectByMouse: true font.family: Constants.logoPopup.licenses.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize FileIO { id: robotoFileIO @@ -65,7 +65,7 @@ ColumnLayout { selectByKeyboard: true selectByMouse: true font.family: Constants.logoPopup.licenses.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize FileIO { id: fontAwesomeFileIO diff --git a/resources/ObservationTabComponents/ObservationTable.qml b/resources/ObservationTabComponents/ObservationTable.qml index de805a0d0..eb8540044 100644 --- a/resources/ObservationTabComponents/ObservationTable.qml +++ b/resources/ObservationTabComponents/ObservationTable.qml @@ -132,7 +132,7 @@ ColumnLayout { elide: Text.ElideRight clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } MouseArea { diff --git a/resources/SettingsTab.qml b/resources/SettingsTab.qml index efc3a6cd6..38ddf2bc8 100644 --- a/resources/SettingsTab.qml +++ b/resources/SettingsTab.qml @@ -288,7 +288,7 @@ MainTab { padding: parent.buttonPadding bottomPadding: refreshButton.bottomPadding text: "SHOW ADVANCED\nSETTINGS" - font.pointSize: refreshButton.font.pointSize + font.pixelSize: refreshButton.font.pixelSize font.family: Constants.fontFamily font.bold: false } diff --git a/resources/SettingsTabComponents/InsSettingsPopup.qml b/resources/SettingsTabComponents/InsSettingsPopup.qml index d4b9a058a..6c782bedf 100644 --- a/resources/SettingsTabComponents/InsSettingsPopup.qml +++ b/resources/SettingsTabComponents/InsSettingsPopup.qml @@ -93,7 +93,7 @@ Item { elide: Text.ElideRight clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } MouseArea { diff --git a/resources/SettingsTabComponents/SettingsPane.qml b/resources/SettingsTabComponents/SettingsPane.qml index 6f9eeafb2..ab3e59059 100644 --- a/resources/SettingsTabComponents/SettingsPane.qml +++ b/resources/SettingsTabComponents/SettingsPane.qml @@ -118,7 +118,7 @@ Rectangle { PropertyChanges { target: valOnDevice - Layout.preferredHeight: isLongTextField(_fieldName) ? 5 * parent.smallRowHeight : 3 * parent.smallRowHeight + Layout.preferredHeight: isLongTextField(_fieldName) ? 4 * parent.smallRowHeight : 3 * parent.smallRowHeight } }, @@ -198,7 +198,7 @@ Rectangle { Layout.rowSpan: 2 Layout.columnSpan: 1 Layout.preferredWidth: parent.colWidthLabel - Layout.preferredHeight: isLongTextField(_fieldName) ? 4 * parent.smallRowHeight : parent.smallRowHeight + Layout.preferredHeight: isLongTextField(_fieldName) ? 3 * parent.smallRowHeight : parent.smallRowHeight sourceComponent: settingRowLabel } @@ -209,7 +209,7 @@ Rectangle { Layout.rowSpan: 2 Layout.columnSpan: parent.columns - 1 Layout.preferredWidth: parent.colWidthField - Layout.preferredHeight: isLongTextField(_fieldName) ? 4 * parent.smallRowHeight : parent.smallRowHeight + Layout.preferredHeight: isLongTextField(_fieldName) ? 3 * parent.smallRowHeight : parent.smallRowHeight } Loader { @@ -328,7 +328,7 @@ Rectangle { font { family: Constants.fontFamily - pointSize: Constants.largePointSize + pixelSize: Constants.largePixelSize } } @@ -352,7 +352,7 @@ Rectangle { text: selectedRowField(_fieldName) wrapMode: Text.Wrap font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize selectByMouse: true anchors.centerIn: parent anchors.verticalCenterOffset: 5 diff --git a/resources/SettingsTabComponents/SettingsTable.qml b/resources/SettingsTabComponents/SettingsTable.qml index 781fc91d5..2d034b242 100644 --- a/resources/SettingsTabComponents/SettingsTable.qml +++ b/resources/SettingsTabComponents/SettingsTable.qml @@ -128,7 +128,7 @@ Rectangle { elide: Text.ElideRight clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } MouseArea { @@ -213,7 +213,7 @@ Rectangle { verticalAlignment: Text.AlignVCenter clip: true font.family: Constants.genericTable.fontFamily - font.pointSize: isHeaderRow(row) ? Constants.xlPointSize : Constants.largePointSize + font.pixelSize: isHeaderRow(row) ? Constants.xlPixelSize : Constants.largePixelSize font.bold: isHeaderRow(row) text: model.display elide: Text.ElideRight diff --git a/resources/SideNavBar.qml b/resources/SideNavBar.qml index 781a7a413..ae518a0cc 100644 --- a/resources/SideNavBar.qml +++ b/resources/SideNavBar.qml @@ -186,7 +186,7 @@ Item { bottomPadding: 0 bottomInset: 0 text: dataRate.toFixed(2) + " KB/s" - font.pointSize: Constants.smallPointSize + font.pixelSize: Constants.smallPixelSize font.bold: true color: Qt.darker("white", enabled ? 1 : 1.4) } diff --git a/resources/SideNavBarComponents/SideNavButton.qml b/resources/SideNavBarComponents/SideNavButton.qml index 7e7335232..f6d2d32da 100644 --- a/resources/SideNavBarComponents/SideNavButton.qml +++ b/resources/SideNavBarComponents/SideNavButton.qml @@ -26,7 +26,7 @@ Button { ToolTip.delay: 1000 ToolTip.timeout: 5000 ToolTip.visible: ToolTip.text.length != 0 && hovered - font.pointSize: Constants.smallPointSize + font.pixelSize: Constants.smallPixelSize font.capitalization: Font.MixedCase font.letterSpacing: 0 // No idea why the insets are set, but they need to be 0 so there are no gaps between buttons. diff --git a/resources/SolutionTabComponents/SolutionPositionTab.qml b/resources/SolutionTabComponents/SolutionPositionTab.qml index b1673c0d4..031e57fd1 100644 --- a/resources/SolutionTabComponents/SolutionPositionTab.qml +++ b/resources/SolutionTabComponents/SolutionPositionTab.qml @@ -297,7 +297,7 @@ Item { id: marker text: "+" - font.pointSize: (Constants.mediumPointSize + Constants.commonLegend.markerPointSizeOffset) + font.pixelSize: (Constants.mediumPixelSize + Constants.commonLegend.markerPixelSizeOffset) font.bold: true color: Constants.solutionPosition.colors[index] anchors.verticalCenter: parent.verticalCenter @@ -308,7 +308,7 @@ Item { id: label text: modelData - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset } diff --git a/resources/SolutionTabComponents/SolutionTable.qml b/resources/SolutionTabComponents/SolutionTable.qml index b9172f340..2a79ee80d 100644 --- a/resources/SolutionTabComponents/SolutionTable.qml +++ b/resources/SolutionTabComponents/SolutionTable.qml @@ -47,7 +47,7 @@ Item { text: tableView.model.columns[index].display elide: Text.ElideRight font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } MouseArea { @@ -132,7 +132,7 @@ Item { wrapMode: Text.Wrap anchors.fill: parent font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize text: Constants.solutionTable.rtkNoteText padding: Constants.solutionTable.rtkNoteMargins } diff --git a/resources/SolutionTabComponents/SolutionVelocityTab.qml b/resources/SolutionTabComponents/SolutionVelocityTab.qml index 164c09008..c99e7a766 100644 --- a/resources/SolutionTabComponents/SolutionVelocityTab.qml +++ b/resources/SolutionTabComponents/SolutionVelocityTab.qml @@ -105,7 +105,7 @@ Item { id: label text: modelData - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset } diff --git a/resources/StatusBar.qml b/resources/StatusBar.qml index 4b11a532b..2096ebaef 100644 --- a/resources/StatusBar.qml +++ b/resources/StatusBar.qml @@ -63,7 +63,7 @@ Rectangle { bottomPadding: Constants.statusBar.verticalPadding text: modelData.labelText color: Constants.statusBar.textColor - font.pointSize: Constants.statusBar.textPointSize + font.pixelSize: Constants.statusBar.textPixelSize } Label { @@ -74,7 +74,7 @@ Rectangle { bottomPadding: Constants.statusBar.verticalPadding text: modelData.valueText color: Constants.statusBar.textColor - font.pointSize: Constants.statusBar.textPointSize + font.pixelSize: Constants.statusBar.textPixelSize font.bold: true } diff --git a/resources/TableComponents/SortableColumnHeading.qml b/resources/TableComponents/SortableColumnHeading.qml index 08856e6bb..03ecafde7 100644 --- a/resources/TableComponents/SortableColumnHeading.qml +++ b/resources/TableComponents/SortableColumnHeading.qml @@ -44,7 +44,7 @@ Rectangle { } property font font: Qt.font({ "family": Constants.genericTable.fontFamily, - "pointSize": Constants.largePointSize + "pixelSize": Constants.largePixelSize }) property color gradientStartColor: Constants.genericTable.cellColor property color gradientStopColor: Constants.genericTable.gradientColor diff --git a/resources/TableComponents/SwiftTableView.qml b/resources/TableComponents/SwiftTableView.qml index c950ae1ca..683ec0baf 100644 --- a/resources/TableComponents/SwiftTableView.qml +++ b/resources/TableComponents/SwiftTableView.qml @@ -18,7 +18,7 @@ TableView { property color delegateBorderColor: Constants.genericTable.borderColor property font tableFont: Qt.font({ "family": Constants.genericTable.fontFamily, - "pointSize": Constants.largePointSize + "pixelSize": Constants.largePixelSize }) clip: true diff --git a/resources/TableComponents/TableCellDelegate.qml b/resources/TableComponents/TableCellDelegate.qml index 4f043953a..0d9b771c3 100644 --- a/resources/TableComponents/TableCellDelegate.qml +++ b/resources/TableComponents/TableCellDelegate.qml @@ -15,7 +15,7 @@ Rectangle { anchors.fill: parent text: display font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize elide: Text.ElideRight verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft diff --git a/resources/TrackingTabComponents/TrackingSkyPlotTab.qml b/resources/TrackingTabComponents/TrackingSkyPlotTab.qml index 1a18e99c9..1940b16c6 100644 --- a/resources/TrackingTabComponents/TrackingSkyPlotTab.qml +++ b/resources/TrackingTabComponents/TrackingSkyPlotTab.qml @@ -46,7 +46,7 @@ Item { Label { text: "N" - font.pointSize: Constants.trackingSkyPlot.directionLabelFontSize + font.pixelSize: Constants.trackingSkyPlot.directionLabelFontSize font.bold: true x: trackingSkyPlotChart.plotArea.x + trackingSkyPlotChart.plotArea.width / 2 - Constants.trackingSkyPlot.directionLabelFontSize / 2 y: trackingSkyPlotChart.plotArea.y - Constants.trackingSkyPlot.directionLabelOffset @@ -60,7 +60,7 @@ Item { visible: false text: "N" font.family: "Roboto" - font.pointSize: Constants.trackingSkyPlot.directionLabelFontSize + font.pixelSize: Constants.trackingSkyPlot.directionLabelFontSize font.bold: true x: trackingSkyPlotChart.plotArea.x + trackingSkyPlotChart.plotArea.width / 2 - width / 2 y: trackingSkyPlotChart.plotArea.y - Constants.trackingSkyPlot.directionLabelOffset @@ -68,7 +68,7 @@ Item { Label { text: "E" - font.pointSize: Constants.trackingSkyPlot.directionLabelFontSize + font.pixelSize: Constants.trackingSkyPlot.directionLabelFontSize font.bold: true x: trackingSkyPlotChart.plotArea.x + trackingSkyPlotChart.plotArea.width + Constants.trackingSkyPlot.directionLabelOffset / 3 y: trackingSkyPlotChart.plotArea.y + trackingSkyPlotChart.plotArea.height / 2 - height / 2 @@ -76,7 +76,7 @@ Item { Label { text: "S" - font.pointSize: Constants.trackingSkyPlot.directionLabelFontSize + font.pixelSize: Constants.trackingSkyPlot.directionLabelFontSize font.bold: true x: trackingSkyPlotChart.plotArea.x + trackingSkyPlotChart.plotArea.width / 2 - width / 2 y: trackingSkyPlotChart.plotArea.y + trackingSkyPlotChart.plotArea.height + Constants.trackingSkyPlot.directionLabelOffset / 5 @@ -84,7 +84,7 @@ Item { Label { text: "W" - font.pointSize: Constants.trackingSkyPlot.directionLabelFontSize + font.pixelSize: Constants.trackingSkyPlot.directionLabelFontSize font.bold: true x: trackingSkyPlotChart.plotArea.x - Constants.trackingSkyPlot.directionLabelOffset y: trackingSkyPlotChart.plotArea.y + trackingSkyPlotChart.plotArea.height / 2 - height / 2 @@ -182,7 +182,7 @@ Item { id: marker text: "●" - font.pointSize: Constants.smallPointSize + font.pixelSize: Constants.smallPixelSize anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset color: Constants.trackingSkyPlot.colors[index] @@ -192,7 +192,7 @@ Item { id: label text: modelData.name - font.pointSize: Constants.smallPointSize + font.pixelSize: Constants.smallPixelSize anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset } diff --git a/resources/UpdateTab.qml b/resources/UpdateTab.qml index 1fdf5f9ae..89544aa64 100644 --- a/resources/UpdateTab.qml +++ b/resources/UpdateTab.qml @@ -86,7 +86,7 @@ MainTab { Label { text: Constants.updateTab.firmwareUpgradeStatusTitle font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } @@ -111,7 +111,7 @@ MainTab { cursorVisible: true activeFocusOnPress: false font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } @@ -126,7 +126,7 @@ MainTab { Label { text: Constants.updateTab.fileioAndProductFeatureToolTitle font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } diff --git a/resources/UpdateTabComponents/FileIOSelectLocalFileAndDestPath.qml b/resources/UpdateTabComponents/FileIOSelectLocalFileAndDestPath.qml index 0aa2d656e..39363e2f7 100644 --- a/resources/UpdateTabComponents/FileIOSelectLocalFileAndDestPath.qml +++ b/resources/UpdateTabComponents/FileIOSelectLocalFileAndDestPath.qml @@ -64,7 +64,7 @@ Item { text: Constants.updateTab.dotDotDotLabel anchors.centerIn: parent font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } @@ -154,7 +154,7 @@ Item { text: Constants.updateTab.fileioSendFileToDeviceButtonLabel anchors.centerIn: parent font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } diff --git a/resources/UpdateTabComponents/FirmwareDownload.qml b/resources/UpdateTabComponents/FirmwareDownload.qml index 7d75acdef..faac64cb8 100644 --- a/resources/UpdateTabComponents/FirmwareDownload.qml +++ b/resources/UpdateTabComponents/FirmwareDownload.qml @@ -61,7 +61,7 @@ Item { text: Constants.updateTab.downloadLatestFirmwareButtonLabel anchors.centerIn: parent font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } diff --git a/resources/UpdateTabComponents/FirmwareVersion.qml b/resources/UpdateTabComponents/FirmwareVersion.qml index c451f21ec..6ae1599b4 100644 --- a/resources/UpdateTabComponents/FirmwareVersion.qml +++ b/resources/UpdateTabComponents/FirmwareVersion.qml @@ -129,7 +129,7 @@ Item { text: Constants.updateTab.updateFirmwareButtonLabel anchors.centerIn: parent font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } diff --git a/resources/UpdateTabComponents/SelectFirmwareDownloadDirectory.qml b/resources/UpdateTabComponents/SelectFirmwareDownloadDirectory.qml index 932923d00..f328be8ff 100644 --- a/resources/UpdateTabComponents/SelectFirmwareDownloadDirectory.qml +++ b/resources/UpdateTabComponents/SelectFirmwareDownloadDirectory.qml @@ -64,7 +64,7 @@ Item { text: Constants.updateTab.dotDotDotLabel anchors.centerIn: parent font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } diff --git a/resources/UpdateTabComponents/SelectLocalFile.qml b/resources/UpdateTabComponents/SelectLocalFile.qml index 117cdce49..83a7bccfb 100644 --- a/resources/UpdateTabComponents/SelectLocalFile.qml +++ b/resources/UpdateTabComponents/SelectLocalFile.qml @@ -63,7 +63,7 @@ Item { text: Constants.updateTab.dotDotDotLabel anchors.centerIn: parent font.family: Constants.genericTable.fontFamily - font.pointSize: Constants.largePointSize + font.pixelSize: Constants.largePixelSize } } diff --git a/resources/qtquickcontrols2.conf b/resources/qtquickcontrols2.conf index af66c1434..983179b3b 100644 --- a/resources/qtquickcontrols2.conf +++ b/resources/qtquickcontrols2.conf @@ -10,4 +10,4 @@ Accent="#FF8300" [Default] Font\Family=Roboto Condensed -Font\PointSize=9 +Font\PixelSize=9 diff --git a/resources/styles/SwiftNav/Button.qml b/resources/styles/SwiftNav/Button.qml index 4f8cfe424..c2a16bc33 100644 --- a/resources/styles/SwiftNav/Button.qml +++ b/resources/styles/SwiftNav/Button.qml @@ -60,7 +60,7 @@ T.Button { font { family: Constants.fontFamily - pointSize: Constants.largePointSize + pixelSize: Constants.largePixelSize } contentItem: IconLabel { diff --git a/resources/styles/SwiftNav/Label.qml b/resources/styles/SwiftNav/Label.qml index 6cc582d24..fced7b702 100644 --- a/resources/styles/SwiftNav/Label.qml +++ b/resources/styles/SwiftNav/Label.qml @@ -47,7 +47,7 @@ T.Label { font { family: Constants.fontFamily - pointSize: Constants.largePointSize + pixelSize: Constants.largePixelSize } } diff --git a/resources/styles/SwiftNav/RoundButton.qml b/resources/styles/SwiftNav/RoundButton.qml index 8c9634e50..308feafd0 100644 --- a/resources/styles/SwiftNav/RoundButton.qml +++ b/resources/styles/SwiftNav/RoundButton.qml @@ -53,7 +53,7 @@ T.RoundButton { font { family: Constants.fontFamily - pointSize: Constants.largePointSize + pixelSize: Constants.largePixelSize } contentItem: IconLabel { diff --git a/resources/styles/SwiftNav/TabButton.qml b/resources/styles/SwiftNav/TabButton.qml index 69cb86441..c7231c326 100644 --- a/resources/styles/SwiftNav/TabButton.qml +++ b/resources/styles/SwiftNav/TabButton.qml @@ -60,7 +60,7 @@ T.TabButton { font { family: "Roboto" - pointSize: Constants.largePointSize + pixelSize: Constants.largePixelSize bold: true capitalization: Font.MixedCase } diff --git a/resources/view.qml b/resources/view.qml index af476d243..3345badfb 100644 --- a/resources/view.qml +++ b/resources/view.qml @@ -13,7 +13,7 @@ ApplicationWindow { minimumWidth: Globals.minimumWidth height: Globals.height minimumHeight: Globals.minimumHeight - font.pointSize: Constants.mediumPointSize + font.pixelSize: Constants.mediumPixelSize visible: true title: (loggingBar.sbpRecording ? "[L] " : " ") + statusBar.title color: Constants.swiftWhite diff --git a/swiftnav_console/main.py b/swiftnav_console/main.py index 3ae9a4c6d..71f0b5bda 100644 --- a/swiftnav_console/main.py +++ b/swiftnav_console/main.py @@ -542,8 +542,6 @@ def handle_cli_arguments(args: argparse.Namespace, globals_: QObject): globals_.setProperty("useOpenGL", True) # type: ignore if args.no_antialiasing: globals_.setProperty("useAntiAliasing", False) # type: ignore - if args.no_high_dpi: - globals_.setProperty("useHighDpi", False) # type: ignore if args.no_prompts: globals_.setProperty("showPrompts", False) # type: ignore if args.refresh_rate is not None: From ad2fc3e43c728836b5ba09eaa3aaa7c08edc1aab Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Thu, 31 Mar 2022 15:27:31 -0700 Subject: [PATCH 2/4] Bump up fonts. --- resources/Constants/Constants.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/Constants/Constants.qml b/resources/Constants/Constants.qml index cd7b06138..cfef6d9cc 100644 --- a/resources/Constants/Constants.qml +++ b/resources/Constants/Constants.qml @@ -46,12 +46,12 @@ QtObject { readonly property string fontFamily: "Roboto Condensed" property FontLoader robotoCondensedLightFont readonly property string lightFontFamily: robotoCondensedLightFont.name - readonly property real xSmallPixelSize: 7 - readonly property real smallPixelSize: 9 - readonly property real mediumPixelSize: 10 - readonly property real largePixelSize: 11 - readonly property real xlPixelSize: 15 - readonly property real xxlPixelSize: 16 + readonly property real xSmallPixelSize: 8 + readonly property real smallPixelSize: 10 + readonly property real mediumPixelSize: 11 + readonly property real largePixelSize: 12 + readonly property real xlPixelSize: 16 + readonly property real xxlPixelSize: 17 readonly property bool debugMode: false readonly property color swiftWhite: "#FFFFFF" readonly property color swiftGrey: "#323F48" From d240fc858616857ecafe43a95ae24289b68215ba Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Thu, 31 Mar 2022 15:51:07 -0700 Subject: [PATCH 3/4] Readjust fonts, revert revert of long settings change. --- resources/Constants/Constants.qml | 8 ++++---- resources/SettingsTabComponents/SettingsPane.qml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/Constants/Constants.qml b/resources/Constants/Constants.qml index cfef6d9cc..a3cec3f4f 100644 --- a/resources/Constants/Constants.qml +++ b/resources/Constants/Constants.qml @@ -50,8 +50,8 @@ QtObject { readonly property real smallPixelSize: 10 readonly property real mediumPixelSize: 11 readonly property real largePixelSize: 12 - readonly property real xlPixelSize: 16 - readonly property real xxlPixelSize: 17 + readonly property real xlPixelSize: 18 + readonly property real xxlPixelSize: 19 readonly property bool debugMode: false readonly property color swiftWhite: "#FFFFFF" readonly property color swiftGrey: "#323F48" @@ -76,7 +76,7 @@ QtObject { readonly property color tabLabelColor: swiftOrange readonly property font tabLabelFont: Qt.font({ "family": "Roboto Condensed", - "pixelSize": 20, + "pixelSize": 25, "bold": true, "letterSpacing": 1, "capitalization": Font.AllUppercase @@ -85,7 +85,7 @@ QtObject { readonly property color appNameColor: swiftLightGrey readonly property font appNameFont: Qt.font({ "family": robotoCondensedLightFont.name, - "pixelSize": 20, + "pixelSize": 25, "letterSpacing": 2, "capitalization": Font.AllUppercase }) diff --git a/resources/SettingsTabComponents/SettingsPane.qml b/resources/SettingsTabComponents/SettingsPane.qml index ab3e59059..281d18ae9 100644 --- a/resources/SettingsTabComponents/SettingsPane.qml +++ b/resources/SettingsTabComponents/SettingsPane.qml @@ -118,7 +118,7 @@ Rectangle { PropertyChanges { target: valOnDevice - Layout.preferredHeight: isLongTextField(_fieldName) ? 4 * parent.smallRowHeight : 3 * parent.smallRowHeight + Layout.preferredHeight: isLongTextField(_fieldName) ? 5 * parent.smallRowHeight : 3 * parent.smallRowHeight } }, @@ -198,7 +198,7 @@ Rectangle { Layout.rowSpan: 2 Layout.columnSpan: 1 Layout.preferredWidth: parent.colWidthLabel - Layout.preferredHeight: isLongTextField(_fieldName) ? 3 * parent.smallRowHeight : parent.smallRowHeight + Layout.preferredHeight: isLongTextField(_fieldName) ? 4 * parent.smallRowHeight : parent.smallRowHeight sourceComponent: settingRowLabel } @@ -209,7 +209,7 @@ Rectangle { Layout.rowSpan: 2 Layout.columnSpan: parent.columns - 1 Layout.preferredWidth: parent.colWidthField - Layout.preferredHeight: isLongTextField(_fieldName) ? 3 * parent.smallRowHeight : parent.smallRowHeight + Layout.preferredHeight: isLongTextField(_fieldName) ? 4 * parent.smallRowHeight : parent.smallRowHeight } Loader { From 5e03ed0c5b3f6fdab7ddb02386ad012af4f7b5a2 Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Thu, 31 Mar 2022 16:06:12 -0700 Subject: [PATCH 4/4] Add row height adjustment for descriptions that are too long to prevent clipping. --- resources/SettingsTabComponents/SettingsPane.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/SettingsTabComponents/SettingsPane.qml b/resources/SettingsTabComponents/SettingsPane.qml index 281d18ae9..2ca7c41c1 100644 --- a/resources/SettingsTabComponents/SettingsPane.qml +++ b/resources/SettingsTabComponents/SettingsPane.qml @@ -220,7 +220,7 @@ Rectangle { Layout.rowSpan: 2 Layout.columnSpan: 1 Layout.preferredWidth: parent.colWidthLabel - Layout.preferredHeight: parent.smallRowHeight + Layout.preferredHeight: isLongTextField(_fieldName) ? 2 * parent.smallRowHeight : parent.smallRowHeight sourceComponent: settingRowLabel } @@ -231,7 +231,7 @@ Rectangle { Layout.rowSpan: 2 Layout.columnSpan: parent.columns - 1 Layout.preferredWidth: parent.colWidthField - Layout.preferredHeight: parent.smallRowHeight + Layout.preferredHeight: isLongTextField(_fieldName) ? 2 * parent.smallRowHeight : parent.smallRowHeight sourceComponent: settingRowText }