M multiplier fix

.travis.yml

@@ -4,7 +4,7 @@ language: generic
 
 install:
   - sudo add-apt-repository -y ppa:beineri/opt-qt551-trusty
-  - sudo add-apt-repository -y ppa:beineri/opt-qt56-trusty
+  - sudo add-apt-repository -y ppa:beineri/opt-qt561-trusty
   - sudo apt-get update
   - sudo apt-get -y install pep8 pyflakes python python-pip npm nodejs nodejs-legacy
   - sudo apt-get -y install qt55declarative qt55quickcontrols qt55graphicaleffects qt55tools qt55svg

demo/demo.qrc

@@ -1,49 +1,45 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource>
-	<file>BottomSheetDemo.qml</file>
-	<file>ButtonDemo.qml</file>
-	<file>CheckBoxDemo.qml</file>
-	<file>ColorPaletteDemo.qml</file>
-	<file>CustomIconsDemo.qml</file>
-	<file>DatePickerDemo.qml</file>
-	<file>DialogDemo.qml</file>
-	<file>FormsDemo.qml</file>
-	<file>ListItemsDemo.qml</file>
-	<file>PageStackDemo.qml</file>
-	<file>ProgressBarDemo.qml</file>
-	<file>RadioButtonDemo.qml</file>
-	<file>SidebarPage.qml</file>
-	<file>SliderDemo.qml</file>
-	<file>SubPage.qml</file>
-	<file>SwitchDemo.qml</file>
-	<file>TextFieldDemo.qml</file>
-	<file>TimePickerDemo.qml</file>
-	<file>TypographyDemo.qml</file>
-	<file>icons/action_account_circle.svg</file>
-	<file>icons/action_autorenew.svg</file>
-	<file>icons/action_delete.svg</file>
-	<file>icons/action_language.svg</file>
-	<file>icons/action_settings.svg</file>
-	<file>icons/alert_warning.svg</file>
-	<file>icons/communication_email.svg</file>
-	<file>icons/content_add.svg</file>
-	<file>icons/content_create.svg</file>
-	<file>icons/content_forward.svg</file>
-	<file>icons/device_access_alarm.svg</file>
-	<file>icons/file_file_download.svg</file>
-	<file>icons/image_color_lens.svg</file>
-	<file>icons/maps_place.svg</file>
-	<file>icons/navigation_arrow_drop_down.svg</file>
-	<file>icons/navigation_menu.svg</file>
-	<file>icons/social_share.svg</file>
-	<file>images/balloon.jpg</file>
-	<file>images/go-last.color.svg</file>
-	<file>images/list-add.color.svg</file>
-	<file>images/weather-pouring.svg</file>
-	<file>images/weather-sunset.svg</file>
-	<file>main.qml</file>
-</qresource>
-
+<RCC>
+    <qresource prefix="/">
+        <file>BottomSheetDemo.qml</file>
+        <file>ButtonDemo.qml</file>
+        <file>CheckBoxDemo.qml</file>
+        <file>ColorPaletteDemo.qml</file>
+        <file>CustomIconsDemo.qml</file>
+        <file>DatePickerDemo.qml</file>
+        <file>DialogDemo.qml</file>
+        <file>FormsDemo.qml</file>
+        <file>ListItemsDemo.qml</file>
+        <file>PageStackDemo.qml</file>
+        <file>ProgressBarDemo.qml</file>
+        <file>RadioButtonDemo.qml</file>
+        <file>SidebarPage.qml</file>
+        <file>SliderDemo.qml</file>
+        <file>SubPage.qml</file>
+        <file>SwitchDemo.qml</file>
+        <file>TextFieldDemo.qml</file>
+        <file>TimePickerDemo.qml</file>
+        <file>TypographyDemo.qml</file>
+        <file>icons/action_account_circle.svg</file>
+        <file>icons/action_autorenew.svg</file>
+        <file>icons/action_delete.svg</file>
+        <file>icons/action_language.svg</file>
+        <file>icons/action_settings.svg</file>
+        <file>icons/alert_warning.svg</file>
+        <file>icons/communication_email.svg</file>
+        <file>icons/content_add.svg</file>
+        <file>icons/content_create.svg</file>
+        <file>icons/content_forward.svg</file>
+        <file>icons/device_access_alarm.svg</file>
+        <file>icons/file_file_download.svg</file>
+        <file>icons/image_color_lens.svg</file>
+        <file>icons/maps_place.svg</file>
+        <file>icons/navigation_arrow_drop_down.svg</file>
+        <file>icons/social_share.svg</file>
+        <file>images/balloon.jpg</file>
+        <file>images/go-last.color.svg</file>
+        <file>images/list-add.color.svg</file>
+        <file>images/weather-pouring.svg</file>
+        <file>images/weather-sunset.svg</file>
+        <file>main.qml</file>
+    </qresource>
 </RCC>

src/components/DatePicker.qml

@@ -67,7 +67,7 @@ Controls.Calendar {
 				Label {
 					id: dayTitle
 					font.weight: Font.DemiBold
-					font.pixelSize: 36 * Units.dp
+                    font.pointSize:  36
 					Layout.fillWidth: true
 					lineHeight: 0.9
 					wrapMode: Text.Wrap

src/controls/Label.qml

@@ -101,8 +101,8 @@ Text {
 
     property var fontInfo: fontStyles[style]
 
-    font.pixelSize: (!Device.isMobile && fontInfo.size_desktop
-            ? fontInfo.size_desktop : fontInfo.size) * Units.dp
+    font.pointSize:  (!Device.isMobile && fontInfo.size_desktop
+            ? fontInfo.size_desktop : fontInfo.size)
     font.family: "Roboto"
     font.weight: {
         var weight = fontInfo.font

src/core/AwesomeIcon.qml

@@ -54,7 +54,7 @@ Item {
         color: Theme.light.iconColor
         style: shadow ? Text.Raised : Text.Normal
         styleColor: Qt.rgba(0,0,0,0.5)
-        font.pixelSize: widget.size
+        font.pointSize: widget.size
 
         Behavior on color {
             ColorAnimation { duration: 200 }

src/core/UnitsHelper.qml

@@ -32,7 +32,7 @@ import QtQuick 2.4
 
        Label {
            text:"A"
-           font.pixelSize: dp(50)
+           font.pointSize: 50
        }
    }
    \endqml

src/core/units.cpp

@@ -20,7 +20,7 @@
 #define DEFAULT_DPI 72
 
 UnitsAttached::UnitsAttached(QObject *attachee)
-        : QObject(attachee), m_screen(nullptr), m_window(nullptr), m_dpi(0), m_multiplier(1)
+    : QObject(attachee), m_screen(nullptr), m_window(nullptr), m_multiplier(1), m_dpi(0)
 {
     m_attachee = qobject_cast<QQuickItem *>(attachee);
 
@@ -59,9 +59,9 @@ void UnitsAttached::screenChanged(QScreen *screen)
             oldScreen->disconnect(this);
 
         if (oldScreen == nullptr || screen == nullptr ||
-            screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch() ||
-            screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch() ||
-            screen->devicePixelRatio() != oldScreen->devicePixelRatio()) {
+                screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch() ||
+                screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch() ||
+                screen->devicePixelRatio() != oldScreen->devicePixelRatio()) {
             updateDPI();
             emit dpChanged();
         }
@@ -127,6 +127,7 @@ void UnitsAttached::updateDPI()
         return;
     }
     m_dpi = displayMetrics.getField<int>("densityDpi");
+    m_multiplier = displayMetrics.getField<float>("density");
 #else
     // standard dpi
     m_dpi = m_screen->logicalDotsPerInch() * m_screen->devicePixelRatio();

src/extras/extras.qrc

@@ -1,14 +1,10 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-
-<qresource prefix="/Material/Extras">
-	<file>AutomaticGrid.qml</file>
-	<file>CircleImage.qml</file>
-	<file>CircleMask.qml</file>
-	<file>ColumnFlow.qml</file>
-	<file>Image.qml</file>
-	<file>circle.png</file>
-	<file>qmldir</file>
-</qresource>
-
+<RCC>
+    <qresource prefix="/Material/Extras">
+        <file>AutomaticGrid.qml</file>
+        <file>CircleImage.qml</file>
+        <file>CircleMask.qml</file>
+        <file>ColumnFlow.qml</file>
+        <file>Image.qml</file>
+        <file>qmldir</file>
+    </qresource>
 </RCC>

src/listitems/Subheader.qml

@@ -40,7 +40,7 @@ View {
     Label {
         id: label
 
-        font.pixelSize: 14 * Units.dp
+        font.pointSize: 14
         font.family: "Roboto"
         font.weight: Font.DemiBold
 

src/popups/MenuField.qml

@@ -157,7 +157,7 @@ Item {
         text: field.placeholderText
         visible: floatingLabel
 
-        font.pixelSize: 12 * Units.dp
+        font.pointSize:  12
 
         anchors.bottom: spinBox.top
         anchors.bottomMargin: 8 * Units.dp
@@ -199,7 +199,7 @@ Item {
         }
 
         visible: hasHelperText
-        font.pixelSize: 12 * Units.dp
+        font.pointSize:  12
         color: field.hasError ? field.errorColor : Qt.darker(Theme.light.hintColor)
 
         Behavior on color {

src/styles/SliderStyle.qml

@@ -52,8 +52,8 @@ SliderStyle {
             verticalAlignment: Qt.AlignVCenter
             text: knobLabel
             fontSizeMode: Text.Fit
-            font.pixelSize: knobDiameter - 19 * Units.dp
-            minimumPixelSize: 6 * Units.dp
+            font.pointSize: knobDiameter - 19
+            minimumPointSize : 6
             wrapMode: Text.WordWrap
             color: Theme.lightDark(styleColor,
                                     Theme.light.textColor,

src/styles/TextFieldStyle.qml

@@ -78,7 +78,7 @@ TextFieldStyle {
 
             anchors.verticalCenter: parent.verticalCenter
             text: control.placeholderText
-            font.pixelSize: 16 * Units.dp
+            font.pointSize: 16
             anchors.margins: -12 * Units.dp
             color: background.hasError ? background.errorColor
                                   : control.activeFocus && control.text !== ""
@@ -95,7 +95,7 @@ TextFieldStyle {
                     }
                     PropertyChanges {
                         target: fieldPlaceholder
-                        font.pixelSize: 12 * Units.dp
+                        font.pointSize: 12
                     }
                 },
                 State {
@@ -117,7 +117,7 @@ TextFieldStyle {
                     }
                     NumberAnimation {
                         duration: 200
-                        property: "font.pixelSize"
+                        property: "font.pointSize"
                     }
                 }
             ]
@@ -137,7 +137,7 @@ TextFieldStyle {
                 id: helperTextLabel
                 visible: background.helperText && background.showBorder
                 text: background.helperText
-                font.pixelSize: 12 * Units.dp
+                font.pointSize: 12
                 color: background.hasError ? background.errorColor
                                            : Qt.darker(Theme.light.hintColor)
 
@@ -154,7 +154,7 @@ TextFieldStyle {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
                 visible: background.characterLimit && background.showBorder
                 text: control.length + " / " + background.characterLimit
-                font.pixelSize: 12 * Units.dp
+                font.pointSize: 12
                 color: background.hasError ? background.errorColor : Theme.light.hintColor
                 horizontalAlignment: Text.AlignLeft