From da6795f0027d56ea3da7684974e7b9677ae7c2c8 Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Mon, 3 Dec 2018 12:42:11 +0100
Subject: [PATCH] Use window scaling parameter for framebuffer size.

---
 app/qml/ApplicationSettings.qml | 2 +-
 app/qml/ShaderTerminal.qml      | 5 ++---
 app/qml/TerminalContainer.qml   | 2 +-
 app/qml/main.qml                | 9 ++-------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml
index f9c9f4d..69fea91 100644
--- a/app/qml/ApplicationSettings.qml
+++ b/app/qml/ApplicationSettings.qml
@@ -155,7 +155,7 @@ QtObject{
         if (index === undefined) return;
 
         fontManager.item.selectedFontIndex = index;
-        fontManager.item.scaling = totalFontScaling * windowScaling;
+        fontManager.item.scaling = totalFontScaling;
 
         var fontSource = fontManager.item.source;
         var pixelSize = fontManager.item.pixelSize;
diff --git a/app/qml/ShaderTerminal.qml b/app/qml/ShaderTerminal.qml
index 75ff66b..5ae04b3 100644
--- a/app/qml/ShaderTerminal.qml
+++ b/app/qml/ShaderTerminal.qml
@@ -338,7 +338,8 @@ ShaderEffect {
      ShaderEffect {
          id: frame
 
-         anchors.fill: parent
+         width: parent.width * appSettings.windowScaling
+         height: parent.height * appSettings.windowScaling
 
          property ShaderEffectSource source: parent.source
          property ShaderEffectSource bloomSource: parent.bloomSource
@@ -494,8 +495,6 @@ ShaderEffect {
 
      ShaderEffectSource {
          id: frameBuffer
-
-         anchors.fill: parent
          visible: false
          sourceItem: frame
          hideSource: true
diff --git a/app/qml/TerminalContainer.qml b/app/qml/TerminalContainer.qml
index 1be51fb..00696d2 100644
--- a/app/qml/TerminalContainer.qml
+++ b/app/qml/TerminalContainer.qml
@@ -36,7 +36,7 @@ ShaderTerminal {
         height: parent.height * appSettings.bloomQuality
 
         sourceComponent: FastBlur{
-            radius: Utils.lint(16, 64, appSettings.bloomQuality * appSettings.windowScaling);
+            radius: Utils.lint(16, 64, appSettings.bloomQuality);
             source: terminal.mainSource
             transparentBorder: true
         }
diff --git a/app/qml/main.qml b/app/qml/main.qml
index 5165c25..99d8522 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -137,13 +137,8 @@ ApplicationWindow{
     TerminalContainer{
         id: terminalContainer
         y: appSettings.showMenubar ? 0 : -2 // Workaroud to hide the margin in the menubar.
-        width: parent.width * appSettings.windowScaling
-        height: (parent.height + Math.abs(y)) * appSettings.windowScaling
-
-        transform: Scale {
-            xScale: 1 / appSettings.windowScaling
-            yScale: 1 / appSettings.windowScaling
-        }
+        width: parent.width
+        height: (parent.height + Math.abs(y))
     }
     SettingsWindow{
         id: settingswindow