Mirroristas/cool-retro-term
2
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-11-24 14:35:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rendering on non HiDPI screens

Browse Source
This commit is contained in:
Cameron Armstrong (Nightfox) 2021-03-28 09:05:36 +08:00
parent dac2b4ff16
commit 08b217ab5f
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/main.cpp
View File

@ -97,8 +97,6 @@ int main(int argc, char *argv[])
engine.rootContext()->setContextProperty("fileIO", &fileIO); engine.rootContext()->setContextProperty("fileIO", &fileIO);
engine.rootContext()->setContextProperty("monospaceSystemFonts", monospaceFontManager.retrieveMonospaceFonts()); engine.rootContext()->setContextProperty("monospaceSystemFonts", monospaceFontManager.retrieveMonospaceFonts());
engine.rootContext()->setContextProperty("devicePixelRatio", app.devicePixelRatio());
// Manage import paths for Linux and OSX. // Manage import paths for Linux and OSX.
QStringList importPathList = engine.importPathList(); QStringList importPathList = engine.importPathList();
importPathList.prepend(QCoreApplication::applicationDirPath() + "/qmltermwidget"); importPathList.prepend(QCoreApplication::applicationDirPath() + "/qmltermwidget");

1
app/qml/ApplicationSettings.qml
View File

@ -42,6 +42,7 @@ QtObject{
property int y: 100 property int y: 100
property int width: 1024 property int width: 1024
property int height: 768 property int height: 768
property real pixelRatio: 1.0
property bool fullscreen: false property bool fullscreen: false
property bool showMenubar: Qt.platform.os === "osx" ? true : false property bool showMenubar: Qt.platform.os === "osx" ? true : false

4
app/qml/Fonts.qml
View File

@ -28,7 +28,7 @@ QtObject{
property bool lowResolutionFont: _font.lowResolutionFont property bool lowResolutionFont: _font.lowResolutionFont
property int pixelSize: lowResolutionFont property int pixelSize: lowResolutionFont
? _font.pixelSize ? _font.pixelSize * 2.0 / appSettings.pixelRatio
: _font.pixelSize * scaling : _font.pixelSize * scaling
property int lineSpacing: lowResolutionFont property int lineSpacing: lowResolutionFont
@ -36,7 +36,7 @@ QtObject{
: pixelSize * _font.lineSpacing : pixelSize * _font.lineSpacing
property real screenScaling: lowResolutionFont property real screenScaling: lowResolutionFont
? _font.baseScaling * scaling ? _font.baseScaling * scaling / 2.0 / appSettings.pixelRatio
: 1.0 : 1.0
property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth

6
app/qml/PreprocessedTerminal.qml
View File

@ -71,7 +71,7 @@ Item{
QMLTermWidget { QMLTermWidget {
id: kterminal id: kterminal
property int textureResolutionScale: appSettings.lowResolutionFont ? devicePixelRatio : 1 property int textureResolutionScale: appSettings.lowResolutionFont ? appSettings.pixelRatio : 1
property int margin: appSettings.margin / screenScaling property int margin: appSettings.margin / screenScaling
property int totalWidth: Math.floor(parent.width / (screenScaling * fontWidth)) property int totalWidth: Math.floor(parent.width / (screenScaling * fontWidth))
property int totalHeight: Math.floor(parent.height / screenScaling) property int totalHeight: Math.floor(parent.height / screenScaling)
@ -81,8 +81,8 @@ Item{
textureSize: Qt.size(width / textureResolutionScale, height / textureResolutionScale) textureSize: Qt.size(width / textureResolutionScale, height / textureResolutionScale)
width: ensureMultiple(rawWidth, devicePixelRatio) width: ensureMultiple(rawWidth, appSettings.pixelRatio)
height: ensureMultiple(rawHeight, devicePixelRatio) height: ensureMultiple(rawHeight, appSettings.pixelRatio)
/** Ensure size is a multiple of factor. This is needed for pixel perfect scaling on highdpi screens. */ /** Ensure size is a multiple of factor. This is needed for pixel perfect scaling on highdpi screens. */
function ensureMultiple(size, factor) { function ensureMultiple(size, factor) {

10
app/qml/main.qml
View File

@ -30,8 +30,14 @@ ApplicationWindow{
height: 768 height: 768
// Save window properties automatically // Save window properties automatically
onXChanged: appSettings.x = x onXChanged: {
onYChanged: appSettings.y = y appSettings.x = x
appSettings.pixelRatio = Window.devicePixelRatio
}
onYChanged: {
appSettings.y = y
appSettings.pixelRatio = Window.devicePixelRatio
}
onWidthChanged: appSettings.width = width onWidthChanged: appSettings.width = width
onHeightChanged: appSettings.height = height onHeightChanged: appSettings.height = height