Merge branch 'unstable'

2014-07-11 00:40:22 +02:00
parent 17615a9f14 7dead18a56
commit cbdf73d713
5 changed files with 36 additions and 21 deletions
@@ -107,12 +107,12 @@ Item{
                    ? virtualCharSize
                    : Qt.size(paintedSize.width / 2, paintedSize.height / 2);

-            var virtualPxSize = Qt.size(paintedSize.width  / charSize.width,
-                                        paintedSize.height / charSize.height)
+            var virtualPxSize = Qt.size((paintedSize.width  / charSize.width) * shadersettings.window_scaling,
+                                        (paintedSize.height / charSize.height) * shadersettings.window_scaling)

            terminalContainer.virtualPxSize = virtualPxSize;

-            setLineSpacing(lineSpacing);
+            setLineSpacing(lineSpacing * shadersettings.window_scaling);
            restartBlurredSource();
        }
        Component.onCompleted: {