Fix: fonts are now working

This commit is contained in:
Filippo Scognamiglio 2014-03-20 15:31:23 +01:00
parent 926ce767f8
commit 13377ba4e7
2 changed files with 9 additions and 9 deletions

View File

@ -39,7 +39,7 @@ Item{
property int frames_index: 2
property var frames_list: framelist
property real font_scaling: 1.0
property real font_scaling: 0.7
property var font: currentfont
property real fontSize: currentfont.pixelSize * font_scaling
property int font_index: 0
@ -79,17 +79,17 @@ Item{
}
ListElement{
text: "Atari 8bit (1979)"
source: "./fonts/Atari8bit/ATARI400800_original.TTF"
source: "fonts/Atari8bit/ATARI400800_original.TTF"
pixelSize: 20
}
ListElement{
text: "Commodore 64 (1982)"
source: "./fonts/Commodore64/C64_User_Mono_v1.0-STYLE.ttf"
source: "fonts/Commodore64/C64_User_Mono_v1.0-STYLE.ttf"
pixelSize: 20
}
ListElement{
text: "IBM DOS (1985)"
source: "./fonts/Dos/Perfect DOS VGA 437.ttf"
source: "fonts/Dos/Perfect DOS VGA 437.ttf"
pixelSize: 32
}
}

View File

@ -99,8 +99,8 @@ ApplicationWindow{
KTerminal {
id: terminal
font.pointSize: 15
font.family: "Pet Me"
font.pointSize: shadersettings.fontSize
font.family: shadersettings.font.name
colorScheme: "WhiteOnBlack"
width: parent.width
@ -116,9 +116,9 @@ ApplicationWindow{
}
Component.onCompleted: {
font.pointSize = 15;
font.family = "Pet Me";
font.pointSize = shadersettings.fontSize;
font.family = shadersettings.font.name;
console.log(shadersettings.font.name);
}
}