diff --git a/src/controls/Theme.qml b/src/controls/Theme.qml index afca1b2..d7ef7c6 100644 --- a/src/controls/Theme.qml +++ b/src/controls/Theme.qml @@ -64,6 +64,8 @@ QtObject { property real hugeRadius: 14.0 property real windowRadius: 11.0 + property var renderType: Text.QtRendering + property font defaultFont: fontMetrics.font property font smallFont: { let font = fontMetrics.font diff --git a/src/fish-style/Label.qml b/src/fish-style/Label.qml index ab1f868..ab54c52 100644 --- a/src/fish-style/Label.qml +++ b/src/fish-style/Label.qml @@ -12,7 +12,7 @@ T.Label { // Text.NativeRendering is broken on non integer pixel ratios // renderType: Window.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering - renderType: Text.NativeRendering + renderType: FishUI.Theme.renderType font.capitalization: FishUI.Theme.defaultFont.capitalization font.family: FishUI.Theme.fontFamily diff --git a/src/fish-style/TextArea.qml b/src/fish-style/TextArea.qml index 7713896..604fad6 100644 --- a/src/fish-style/TextArea.qml +++ b/src/fish-style/TextArea.qml @@ -46,9 +46,7 @@ T.TextArea { verticalAlignment: TextEdit.AlignTop hoverEnabled: false - // https://bugreports.qt.io/browse/QTBUG-67007 - // This bug has been fixed since 5.11.0 Beta 3. - renderType: Text.NativeRendering + renderType: FishUI.Theme.renderType selectByMouse: true diff --git a/src/fish-style/TextField.qml b/src/fish-style/TextField.qml index 567010c..aaf0e16 100644 --- a/src/fish-style/TextField.qml +++ b/src/fish-style/TextField.qml @@ -41,7 +41,8 @@ T.TextField { rightPadding: FishUI.Units.smallSpacing + FishUI.Units.extendBorderWidth //Text.NativeRendering is broken on non integer pixel ratios - renderType: Window.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering + // renderType: Window.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering + renderType: FishUI.Theme.renderType color: control.enabled ? FishUI.Theme.textColor : FishUI.Theme.disabledTextColor selectionColor: FishUI.Theme.highlightColor