From d27e6569a0f4d34ed743dc9d0c8a8fe36b0a5b6e Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Sat, 17 Nov 2018 23:17:36 +0100 Subject: [PATCH] Reduce default font size. --- app/qml/ApplicationSettings.qml | 5 ++++- app/qml/ShaderTerminal.qml | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml index 37f330d..1742d89 100644 --- a/app/qml/ApplicationSettings.qml +++ b/app/qml/ApplicationSettings.qml @@ -94,7 +94,10 @@ QtObject{ // FONTS ////////////////////////////////////////////////////////////////// + readonly property real baseFontScaling: 0.75 property real fontScaling: 1.0 + property real totalFontScaling: baseFontScaling * fontScaling + property real fontWidth: 1.0 property bool lowResolutionFont: false @@ -150,7 +153,7 @@ QtObject{ if (index === undefined) return; fontManager.item.selectedFontIndex = index; - fontManager.item.scaling = fontScaling * windowScaling; + fontManager.item.scaling = totalFontScaling * windowScaling; var fontSource = fontManager.item.source; var pixelSize = fontManager.item.pixelSize; diff --git a/app/qml/ShaderTerminal.qml b/app/qml/ShaderTerminal.qml index bf62e6e..593fbf7 100644 --- a/app/qml/ShaderTerminal.qml +++ b/app/qml/ShaderTerminal.qml @@ -41,15 +41,15 @@ ShaderEffect { property size jitterDisplacement: Qt.size(0.007 * jitter, 0.002 * jitter) property real staticNoise: appSettings.staticNoise - property size scaleNoiseSize: Qt.size((width) / (noiseTexture.width * appSettings.windowScaling * appSettings.fontScaling), - (height) / (noiseTexture.height * appSettings.windowScaling * appSettings.fontScaling)) + property size scaleNoiseSize: Qt.size((width) / (noiseTexture.width * appSettings.windowScaling * appSettings.totalFontScaling), + (height) / (noiseTexture.height * appSettings.windowScaling * appSettings.totalFontScaling)) property real screenCurvature: appSettings.screenCurvature property real glowingLine: appSettings.glowingLine * 0.2 property real chromaColor: appSettings.chromaColor; - property real rbgShift: (appSettings.rbgShift / width) * appSettings.fontScaling + property real rbgShift: (appSettings.rbgShift / width) * appSettings.totalFontScaling property real flickering: appSettings.flickering property real horizontalSync: appSettings.horizontalSync * 0.5