Merge pull request #303 from Esri/michael-tims/Linux_base_ppi_scaleFactor

GuillaumeBelzPro · web-flow · commit 30d05f3e5e9d · 2018-09-20T12:47:15.000+01:00
Update Linux base PPI for scaleFactor
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/Callout.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/Callout.qml
@@ -215,7 +215,7 @@ Item {
     /*! \internal */
     property int padding: 3 * displayScaleFactor
     /*! \internal */
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
     /*! \internal */
     property real anchorPointx: 0
     /*! \internal */
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/ArcGISCompass.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/ArcGISCompass.qml
@@ -49,7 +49,7 @@ Item {
          }
       \endcode
      */
-    property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     /*!
       \qmlproperty bool autoHideCompass
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/CoordinateConversion.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/CoordinateConversion.qml
@@ -51,7 +51,7 @@ Item {
          }
       \endcode
      */
-    property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     /*!
       \qmlproperty int textColor
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/TimeSlider.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/TimeSlider.qml
@@ -87,7 +87,7 @@ Item {
       the width or height of UI elements so that the sizes appear similar
       (relative to screen size) across devices.
       */
-    property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     /*!
       \qmlproperty int textColor
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/LocationButton20.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/LocationButton20.qml
@@ -25,7 +25,7 @@ StyleButton {
     id: locationButton
     property bool isActive: mapview && mapview.locationDisplay.started
     property int maxModes: 4;
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
     property MapView mapview: null
 
     visible: mapview && mapview.locationDisplay
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/NorthArrow20.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/NorthArrow20.qml
@@ -25,7 +25,7 @@ Item {
     property MapView mapview: null
     property real size: 40
     property bool resetOnClick: true
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     signal clicked()
 
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/OverviewMap20.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/OverviewMap20.qml
@@ -31,7 +31,7 @@ Item {
     property var overviewLayer: null
     property string fillColor : "#60000000"
     property real zoomRatio: 10
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     width: 200 * displayScaleFactor
     height: width * 0.665
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/PopupStackView.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/PopupStackView.qml
@@ -67,7 +67,7 @@ Item {
     id: popupStackView
 
     /*! \internal */
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     /*========================================
          Configurable properties
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/PopupView.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/PopupView.qml
@@ -68,7 +68,7 @@ Item {
     id: popupView
 
     /*! \internal */
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     /*========================================
          Configurable properties
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/PopupViewBase.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/PopupViewBase.qml
@@ -34,7 +34,7 @@ Item {
     property color attributeValueTextColorInternal
     property color closeButtonColorInternal
     property var popupManagerInternal: null
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
     property var displayedFields: null
     property var attachments: null
     property bool showAttachments: false
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/QmlApi/TimeSlider.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/QmlApi/TimeSlider.qml
@@ -87,7 +87,7 @@ Item {
       the width or height of UI elements so that the sizes appear similar
       (relative to screen size) across devices.
       */
-    property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     /*!
       \qmlproperty int textColor
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/SearchBox20.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/SearchBox20.qml
@@ -23,7 +23,7 @@ import QtQuick.Window 2.0
 Item {
     id: searchbox
 
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
     property alias searchTextInput: textInput.text
     property string descriptionTextInput: " "
     property bool descriptionTextVisibility: false
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/StyleButton20.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/StyleButton20.qml
@@ -31,7 +31,7 @@ Button {
     property color backgroundColor: "#F7F8F8"
     property color focusBorderColor: "#AADBFA"
     property color borderColor: "#CBCBCB"
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
     property alias fader: fader
 
     width: internal._size
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Controls/StyleToolbar20.qml b/Import/Esri/ArcGISRuntime/Toolkit/Controls/StyleToolbar20.qml
@@ -34,7 +34,7 @@ GridLayout {
     property color focusBorderColor: "#AADBFA"
     property color borderColor: "#CBCBCB"
     property string orientation: "portrait"
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     // Default orientation Properties which can be overwritten at
     // the time of defining the StyleToolbar in your qml file.
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Dialogs/ClientCertificateView.qml b/Import/Esri/ArcGISRuntime/Toolkit/Dialogs/ClientCertificateView.qml
@@ -49,7 +49,7 @@ Rectangle {
     /*! \internal */
     property string detailText: qsTr("The service has requested a client certificate to authenticate you. The app has identified the requesting server as '%1', but you should only give the app access to the certificate if you trust it.").arg(requestingHost)
     /*! \internal */
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
     /*! \internal */
     property string requestingHost: challenge ? challenge.authenticatingHost : ""
     /*! \internal */
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Dialogs/ImagePopUpDialog20.qml b/Import/Esri/ArcGISRuntime/Toolkit/Dialogs/ImagePopUpDialog20.qml
@@ -21,7 +21,7 @@ Item {
     id: dialogComponent
     anchors.fill: parent
     property string platform: Qt.platform.os
-    property double scalefactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property double scalefactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
     property string portBackground
 
     PropertyAnimation {
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Dialogs/SslHandshakeView.qml b/Import/Esri/ArcGISRuntime/Toolkit/Dialogs/SslHandshakeView.qml
@@ -51,7 +51,7 @@ Rectangle {
     /*! \internal */
     property string detailText: qsTr("The server could not prove itself; its security certificate is not trusted by your OS. Would you like to continue anyway?")
     /*! \internal */
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
 
     RadialGradient {
         anchors.fill: parent
diff --git a/Import/Esri/ArcGISRuntime/Toolkit/Dialogs/UserCredentialsView.qml b/Import/Esri/ArcGISRuntime/Toolkit/Dialogs/UserCredentialsView.qml
@@ -55,7 +55,7 @@ Rectangle {
     property var challenge
 
     /*! \internal */
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
+    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
     /*! \internal */
     property string requestingHost: challenge ? challenge.authenticatingHost : ""
     /*! \internal */

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ Item {`
`49`	`49`	`}`
`50`	`50`	`\endcode`
`51`	`51`	`*/`
`52`		`- property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)`
	`52`	`+ property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" \|\| Qt.platform.os === "linux" ? 96 : 72)`
`53`	`53`
`54`	`54`	`/*!`
`55`	`55`	`\qmlproperty bool autoHideCompass`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ Item {`
`51`	`51`	`}`
`52`	`52`	`\endcode`
`53`	`53`	`*/`
`54`		`- property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)`
	`54`	`+ property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" \|\| Qt.platform.os === "linux" ? 96 : 72)`
`55`	`55`
`56`	`56`	`/*!`
`57`	`57`	`\qmlproperty int textColor`