Fix background in settings window

.gitignore

@@ -48,6 +48,3 @@ cool-retro-term
 
 .DS_Store
 *.app
-
-# IntelliJ
-.idea

app/main.cpp

@@ -58,7 +58,6 @@ int main(int argc, char *argv[])
         cout << "  -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
         cout << "  -h|--help           Print this help." << '\n';
         cout << "  --verbose           Print additional information such as profiles and settings." << '\n';
-        cout << "  -v|--version        Print the program name and version." << '\n';
         return 0;
     }
 

app/qml/ApplicationSettings.qml

@@ -32,7 +32,7 @@ QtObject {
     readonly property real maximumFontScaling: 2.50
 
     readonly property real minBurnInFadeTime: 160
-    readonly property real maxBurnInFadeTime: 1600
+    readonly property real maxBurnInFadeTime: 160000
 
     property bool isMacOS: Qt.platform.os === "osx"
 

app/qml/BurnInEffect.qml

@@ -29,8 +29,8 @@ Loader {
     property real lastUpdate: 0
     property real prevLastUpdate: 0
 
-    property real burnIn: appSettings.burnIn
+    property real burnIn: appSettings.burnIn;
-    property real burnInFadeTime: 1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn)
+    property real burnInFadeTime: (1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn))*64
     property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
     property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
 
@@ -146,9 +146,8 @@ Loader {
                     float prevMask = accColor.a;
                     float currMask = rgb2grey(txtColor);
 
-                    highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0);
+                    highp float blurDecay = clamp(pow(0.5, burnInTime * (lastUpdate - prevLastUpdate)), 0.0, 1.0);
-                    blurDecay = max(0.0, blurDecay - prevMask);
+                    vec3 blurColor = accColor.rgb * vec3(blurDecay);
-                    vec3 blurColor = accColor.rgb - vec3(blurDecay);
                     vec3 color = max(blurColor, txtColor);
 
                     gl_FragColor = vec4(color, currMask);

app/qml/PreprocessedTerminal.qml

@@ -58,13 +58,6 @@ Item{
             kterminal.pasteClipboard()
         }
     }
-    Connections {
-        target: pasteActionAlt
-
-        onTriggered: {
-            kterminal.pasteSelection()
-        }
-    }
 
     //When settings are updated sources need to be redrawn.
     Connections {

app/qml/SettingsWindow.qml

@@ -30,6 +30,7 @@ Window {
     width: 640
     height: 640
 
+    color: palette.window
     property int tabmargins: 15
 
     Item {

app/qml/ShaderTerminal.qml

@@ -321,8 +321,8 @@ Item {
 
                  (burnIn !== 0 ? "
                      vec4 txt_blur = texture2D(burnInSource, staticCoords);
-                     float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0);
+                     float blurDecay = clamp(pow(0.5, burnInTime * (time - burnInLastUpdate)), 0.0, 1.0);
-                     vec3 burnInColor = 0.65 * (txt_blur.rgb - vec3(blurDecay));
+                     vec3 burnInColor = txt_blur.rgb * vec3(blurDecay);
                      txt_color = max(txt_color, convertWithChroma(burnInColor));"
                  : "") +
 

app/qml/main.qml

@@ -116,11 +116,6 @@ ApplicationWindow {
         text: qsTr("Paste")
         shortcut: "Ctrl+Shift+V"
     }
-    Action {
-        id: pasteActionAlt
-        text: qsTr("Paste selection")
-        shortcut: "Shift+Insert"
-    }
     Action {
         id: zoomIn
         text: qsTr("Zoom In")