Browse Source

Merge pull request #1970 from DonLakeFlyer/Tablet

Tablet usability fixes
QGC4.4
Don Gagne 10 years ago
parent
commit
76077ac552
  1. 9
      src/AutoPilotPlugins/PX4/PowerComponent.qml
  2. 2
      src/MissionEditor/MissionEditor.qml
  3. 2
      src/QmlControls/QGCButton.qml
  4. 2
      src/QmlControls/QGCCheckBox.qml
  5. 2
      src/QmlControls/QGCComboBox.qml
  6. 2
      src/QmlControls/QGCRadioButton.qml
  7. 1
      src/QmlControls/QGCTextField.qml

9
src/AutoPilotPlugins/PX4/PowerComponent.qml

@ -104,9 +104,15 @@ QGCView { @@ -104,9 +104,15 @@ QGCView {
id: panel
anchors.fill: parent
Flickable {
anchors.fill: parent
flickableDirection: Flickable.VerticalFlick
contentHeight: innerColumn.height
Column {
anchors.fill: parent
id: innerColumn
anchors.left: parent.left
anchors.right: parent.right
spacing: ScreenTools.defaultFontPixelHeight
QGCLabel {
@ -352,5 +358,6 @@ QGCView { @@ -352,5 +358,6 @@ QGCView {
}
} // Rectangle - Advanced power settings
} // Column
} // Flickable
} // QGCViewPanel
} // QGCView

2
src/MissionEditor/MissionEditor.qml

@ -108,7 +108,7 @@ QGCView { @@ -108,7 +108,7 @@ QGCView {
Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
width: parent.width / 3
width: parent.width * 0.75
height: syncNeededText.height + (ScreenTools.defaultFontPixelWidth * 2)
border.width: 1
border.color: "white"

2
src/QmlControls/QGCButton.qml

@ -64,7 +64,7 @@ Button { @@ -64,7 +64,7 @@ Button {
background: Item {
property bool down: control.pressed || (control.checkable && control.checked)
implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5)
implicitHeight: Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
Rectangle {
anchors.fill: parent

2
src/QmlControls/QGCCheckBox.qml

@ -11,7 +11,7 @@ CheckBox { @@ -11,7 +11,7 @@ CheckBox {
style: CheckBoxStyle {
label: Item {
implicitWidth: text.implicitWidth + 2
implicitHeight: text.implicitHeight
implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : text.implicitHeight
baselineOffset: text.baselineOffset
Rectangle {
anchors.fill: text

2
src/QmlControls/QGCComboBox.qml

@ -18,7 +18,7 @@ ComboBox { @@ -18,7 +18,7 @@ ComboBox {
background: Item {
implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5)
implicitHeight: Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
Rectangle {
anchors.fill: parent

2
src/QmlControls/QGCRadioButton.qml

@ -11,7 +11,7 @@ RadioButton { @@ -11,7 +11,7 @@ RadioButton {
style: RadioButtonStyle {
label: Item {
implicitWidth: text.implicitWidth + 2
implicitHeight: text.implicitHeight
implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : text.implicitHeight
baselineOffset: text.y + text.baselineOffset
Rectangle {
anchors.fill: text

1
src/QmlControls/QGCTextField.qml

@ -12,6 +12,7 @@ TextField { @@ -12,6 +12,7 @@ TextField {
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled }
textColor: __qgcPal.textFieldText
height: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : implicitHeight
Label {
id: unitsLabelWidthGenerator

Loading…
Cancel
Save