From a1269ad0595b4f023ed67ac0f22fa419f8d6c110 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 23 Oct 2018 12:18:26 +0200 Subject: [PATCH] revert icons scaling on mobile plasma mobile can't handle that --- .../kirigamiplasmadesktopstyle/Units.qml | 12 ++++++------ src/declarativeimports/kirigamiplasmastyle/Units.qml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/declarativeimports/kirigamiplasmadesktopstyle/Units.qml b/src/declarativeimports/kirigamiplasmadesktopstyle/Units.qml index 40903b7aa..6832a8078 100644 --- a/src/declarativeimports/kirigamiplasmadesktopstyle/Units.qml +++ b/src/declarativeimports/kirigamiplasmadesktopstyle/Units.qml @@ -55,12 +55,12 @@ QtObject { * * desktop */ property QtObject iconSizes: QtObject { - property int small: Math.floor(fontMetrics.roundedIconSize(16 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int smallMedium: Math.floor(fontMetrics.roundedIconSize(22 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int medium: Math.floor(fontMetrics.roundedIconSize(32 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int large: Math.floor(fontMetrics.roundedIconSize(48 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int huge: Math.floor(fontMetrics.roundedIconSize(64 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int enormous: Math.floor(128 * devicePixelRatio * (Settings.isMobile ? 1.5 : 1)) + property int small: fontMetrics.roundedIconSize(16 * devicePixelRatio) + property int smallMedium: fontMetrics.roundedIconSize(22 * devicePixelRatio) + property int medium: fontMetrics.roundedIconSize(32 * devicePixelRatio) + property int large: fontMetrics.roundedIconSize(48 * devicePixelRatio) + property int huge: fontMetrics.roundedIconSize(64 * devicePixelRatio) + property int enormous: 128 * devicePixelRatio } /** diff --git a/src/declarativeimports/kirigamiplasmastyle/Units.qml b/src/declarativeimports/kirigamiplasmastyle/Units.qml index 045f7f93b..cd339f33a 100644 --- a/src/declarativeimports/kirigamiplasmastyle/Units.qml +++ b/src/declarativeimports/kirigamiplasmastyle/Units.qml @@ -49,12 +49,12 @@ QtObject { * * desktop */ property QtObject iconSizes: QtObject { - property int small: Math.floor(fontMetrics.roundedIconSize(16 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int smallMedium: Math.floor(fontMetrics.roundedIconSize(22 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int medium: Math.floor(fontMetrics.roundedIconSize(32 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int large: Math.floor(fontMetrics.roundedIconSize(48 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int huge: Math.floor(fontMetrics.roundedIconSize(64 * devicePixelRatio) * (Settings.isMobile ? 1.5 : 1)) - property int enormous: Math.floor(128 * devicePixelRatio * (Settings.isMobile ? 1.5 : 1)) + property int small: fontMetrics.roundedIconSize(16 * devicePixelRatio) + property int smallMedium: fontMetrics.roundedIconSize(22 * devicePixelRatio) + property int medium: fontMetrics.roundedIconSize(32 * devicePixelRatio) + property int large: fontMetrics.roundedIconSize(48 * devicePixelRatio) + property int huge: fontMetrics.roundedIconSize(64 * devicePixelRatio) + property int enormous: 128 * devicePixelRatio } /**