Refactor main and terminal container.

This commit is contained in:
Filippo Scognamiglio 2014-12-11 01:48:30 +01:00
parent dcb332b06f
commit 6b9a2ed5d2
2 changed files with 27 additions and 37 deletions

View File

@ -1,44 +1,20 @@
import QtQuick 2.2
Item{
ShaderTerminal{
property alias title: terminal.title
property alias terminalSize: terminal.terminalSize
Item{
id: scalableContent
width: parent.width * shadersettings.window_scaling
height: parent.height * shadersettings.window_scaling
id: shadercontainer
opacity: shadersettings.windowOpacity * 0.3 + 0.7
Loader{
id: frame
anchors.fill: parent
z: 2.1
source: shadersettings.frame_source
}
PreprocessedTerminal{
id: terminal
anchors.fill: parent
}
ShaderTerminal{
id: shadercontainer
anchors.fill: parent
opacity: shadersettings.windowOpacity * 0.3 + 0.7
z: 1.9
}
transform: Scale {
xScale: 1 / shadersettings.window_scaling
yScale: 1 / shadersettings.window_scaling
}
}
// Terminal size overlay. Shown when terminal size changes.
Loader{
id: sizeoverlayloader
z: 3
anchors.centerIn: parent
active: shadersettings.show_terminal_size
sourceComponent: SizeOverlay{
terminalSize: terminal.terminalSize
}
id: frame
anchors.fill: parent
z: 2.1
source: shadersettings.frame_source
}
PreprocessedTerminal{
id: terminal
anchors.fill: parent
}
}

View File

@ -110,7 +110,13 @@ ApplicationWindow{
}
TerminalContainer{
id: terminalContainer
anchors.fill: parent
width: parent.width * shadersettings.window_scaling
height: parent.height * shadersettings.window_scaling
transform: Scale {
xScale: 1 / shadersettings.window_scaling
yScale: 1 / shadersettings.window_scaling
}
}
SettingsWindow{
id: settingswindow
@ -120,5 +126,13 @@ ApplicationWindow{
id: aboutDialog
visible: false
}
Loader{
anchors.centerIn: parent
active: shadersettings.show_terminal_size
sourceComponent: SizeOverlay{
z: 3
terminalSize: terminalContainer.terminalSize
}
}
Component.onCompleted: shadersettings.handleFontChanged();
}