Browse Source

Fix instrument widget width issues for 4k screens

QGC4.4
Jacob Walser 8 years ago
parent
commit
21cff51cf1
  1. 2
      src/FlightDisplay/FlightDisplayViewWidgets.qml
  2. 5
      src/QmlControls/ScreenTools.qml

2
src/FlightDisplay/FlightDisplayViewWidgets.qml

@ -41,6 +41,8 @@ Item {
function getPreferredInstrumentWidth() { function getPreferredInstrumentWidth() {
if(ScreenTools.isMobile) { if(ScreenTools.isMobile) {
return mainWindow.width * 0.25 return mainWindow.width * 0.25
} else if(ScreenTools.isHugeScreen) {
return mainWindow.width * 0.11
} }
return ScreenTools.defaultFontPixelWidth * 30 return ScreenTools.defaultFontPixelWidth * 30
} }

5
src/QmlControls/ScreenTools.qml

@ -60,6 +60,7 @@ Item {
property bool isDebug: ScreenToolsController.isDebug property bool isDebug: ScreenToolsController.isDebug
property bool isTinyScreen: (Screen.width / Screen.pixelDensity) < 120 // 120mm property bool isTinyScreen: (Screen.width / Screen.pixelDensity) < 120 // 120mm
property bool isShortScreen: ScreenToolsController.isMobile && ((Screen.height / Screen.width) < 0.6) // Nexus 7 for example property bool isShortScreen: ScreenToolsController.isMobile && ((Screen.height / Screen.width) < 0.6) // Nexus 7 for example
property bool isHugeScreen: Screen.width >= 1920*2
readonly property real minTouchMillimeters: 10 ///< Minimum touch size in millimeters readonly property real minTouchMillimeters: 10 ///< Minimum touch size in millimeters
property real minTouchPixels: 0 ///< Minimum touch size in pixels property real minTouchPixels: 0 ///< Minimum touch size in pixels
@ -90,6 +91,10 @@ Item {
} }
} }
function printScreenStats() {
console.log('ScreenTools: Screen.width: ' + Screen.width + ' Screen.height: ' + Screen.height + ' Screen.pixelDensity: ' + Screen.pixelDensity)
}
/// Returns the current x position of the mouse in global screen coordinates. /// Returns the current x position of the mouse in global screen coordinates.
function mouseX() { function mouseX() {
return ScreenToolsController.mouseX() return ScreenToolsController.mouseX()

Loading…
Cancel
Save