diff options
-rw-r--r-- | src/dialogs/DefaultFileDialog.qml | 8 | ||||
-rw-r--r-- | src/dialogs/DefaultFontDialog.qml | 2 | ||||
-rw-r--r-- | src/dialogs/DefaultMessageDialog.qml | 4 | ||||
-rw-r--r-- | src/dialogs/qml/ColorSlider.qml | 2 | ||||
-rw-r--r-- | src/dialogs/qml/IconButtonStyle.qml | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml index 47d59481..feb31c4d 100644 --- a/src/dialogs/DefaultFileDialog.qml +++ b/src/dialogs/DefaultFileDialog.qml @@ -203,7 +203,7 @@ AbstractFileDialog { margins: 4 } elide: Text.ElideLeft - renderType: Text.NativeRendering + renderType: ControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering Component.onCompleted: { sidebarSplitter.rowHeight = parent.height if (implicitWidth * 1.2 > sidebarSplitter.maxShortcutWidth) @@ -237,7 +237,7 @@ AbstractFileDialog { margins: 4 } elide: Text.ElideLeft - renderType: Text.NativeRendering + renderType: ControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering } Menu { id: favoriteCtxMenu @@ -350,7 +350,7 @@ AbstractFileDialog { } color: styleData.textColor elide: Text.ElideRight - renderType: Text.NativeRendering + renderType: ControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering } } } @@ -373,7 +373,7 @@ AbstractFileDialog { } color: styleData.textColor elide: Text.ElideRight - renderType: Text.NativeRendering + renderType: ControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering } } } diff --git a/src/dialogs/DefaultFontDialog.qml b/src/dialogs/DefaultFontDialog.qml index 041be844..4bd4a1be 100644 --- a/src/dialogs/DefaultFontDialog.qml +++ b/src/dialogs/DefaultFontDialog.qml @@ -40,6 +40,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.2 +import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.0 import QtQuick.Dialogs 1.1 import QtQuick.Dialogs.Private 1.1 @@ -387,6 +388,7 @@ AbstractFontDialog { anchors.centerIn: parent font: content.font onFocusChanged: if (!focus && sample.text == "") sample.text = content.writingSystemSample + renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering } } } diff --git a/src/dialogs/DefaultMessageDialog.qml b/src/dialogs/DefaultMessageDialog.qml index b41b3743..609d060c 100644 --- a/src/dialogs/DefaultMessageDialog.qml +++ b/src/dialogs/DefaultMessageDialog.qml @@ -40,6 +40,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.2 +import QtQuick.Controls.Private 1.0 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.1 import "qml" @@ -115,6 +116,7 @@ AbstractMessageDialog { text: root.text font.weight: Font.Bold wrapMode: Text.WordWrap + renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering } Text { @@ -128,6 +130,7 @@ AbstractMessageDialog { } text: root.informativeText wrapMode: Text.WordWrap + renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering } } @@ -285,6 +288,7 @@ AbstractMessageDialog { wrapMode: Text.WordWrap readOnly: true selectByMouse: true + renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering } } } diff --git a/src/dialogs/qml/ColorSlider.qml b/src/dialogs/qml/ColorSlider.qml index 219da0cb..60412d54 100644 --- a/src/dialogs/qml/ColorSlider.qml +++ b/src/dialogs/qml/ColorSlider.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 +import QtQuick.Controls.Private 1.0 Item { id: colorSlider @@ -76,6 +77,7 @@ Item { text: colorSlider.text anchors.left: parent.left color: palette.windowText + renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering } Item { diff --git a/src/dialogs/qml/IconButtonStyle.qml b/src/dialogs/qml/IconButtonStyle.qml index 3af5b6cd..f51cf253 100644 --- a/src/dialogs/qml/IconButtonStyle.qml +++ b/src/dialogs/qml/IconButtonStyle.qml @@ -49,7 +49,7 @@ ButtonStyle { id: text font.family: iconFont.name font.pointSize: TextSingleton.font.pointSize * 1.5 - renderType: Text.NativeRendering + renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering text: control.text color: SystemPaletteSingleton.buttonText(control.enabled) verticalAlignment: Text.AlignVCenter |