sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-04-13 06:10:53 +01:00
Code Issues Releases Wiki Activity

Font size is now set in pixel so the line spacing is now really proportional, this should fix the problem with cropped fonts.

Browse Source
This commit is contained in:
Filippo Scognamiglio 2014-05-27 23:54:28 +02:00
parent 12f09ddf52
commit 110f91afa5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/ShaderSettings.qml
View File

@ -116,43 +116,43 @@ Item{
ListElement{ ListElement{
text: "Terminus (Modern)" text: "Terminus (Modern)"
source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf" source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf"
pixelSize: 22 pixelSize: 30
lineSpacing: 0.1 lineSpacing: 0.1
} }
ListElement{ ListElement{
text: "Commodore PET (1977)" text: "Commodore PET (1977)"
source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf" source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf"
pixelSize: 15 pixelSize: 22
lineSpacing: 0.2 lineSpacing: 0.2
} }
ListElement{ ListElement{
text: "Apple ][ (1977)" text: "Apple ][ (1977)"
source: "fonts/1977-apple2/PrintChar21.ttf" source: "fonts/1977-apple2/PrintChar21.ttf"
pixelSize: 18 pixelSize: 24
lineSpacing: 0.2 lineSpacing: 0.2
} }
ListElement{ ListElement{
text: "Atari 400-800 (1979)" text: "Atari 400-800 (1979)"
source: "fonts/1979-atari-400-800/ATARI400800_original.TTF" source: "fonts/1979-atari-400-800/ATARI400800_original.TTF"
pixelSize: 16 pixelSize: 22
lineSpacing: 0.25 lineSpacing: 0.25
} }
ListElement{ ListElement{
text: "Commodore 64 (1982)" text: "Commodore 64 (1982)"
source: "fonts/1982-commodore64/C64_User_Mono_v1.0-STYLE.ttf" source: "fonts/1982-commodore64/C64_User_Mono_v1.0-STYLE.ttf"
pixelSize: 16 pixelSize: 22
lineSpacing: 0.25 lineSpacing: 0.25
} }
ListElement{ ListElement{
text: "Atari ST (1985)" text: "Atari ST (1985)"
source: "fonts/1985-atari-st/AtariST8x16SystemFont.ttf" source: "fonts/1985-atari-st/AtariST8x16SystemFont.ttf"
pixelSize: 18 pixelSize: 26
lineSpacing: 0.2 lineSpacing: 0.2
} }
ListElement{ ListElement{
text: "IBM DOS (1985)" text: "IBM DOS (1985)"
source: "fonts/1985-ibm-pc-vga/Perfect DOS VGA 437.ttf" source: "fonts/1985-ibm-pc-vga/Perfect DOS VGA 437.ttf"
pixelSize: 20 pixelSize: 30
lineSpacing: 0.1 lineSpacing: 0.1
} }
} }

4
app/Terminal.qml
View File

@ -66,7 +66,7 @@ Item{
sourceComponent: KTerminal { sourceComponent: KTerminal {
id: ktermitem id: ktermitem
font.pointSize: shadersettings.fontSize font.pixelSize: shadersettings.fontSize
font.family: shadersettings.font.name font.family: shadersettings.font.name
colorScheme: "MyWhiteOnBlack" colorScheme: "MyWhiteOnBlack"
@ -88,7 +88,7 @@ Item{
var scaling_factor = shadersettings.font_scaling * shadersettings.window_scaling; var scaling_factor = shadersettings.font_scaling * shadersettings.window_scaling;
var font_size = shadersettings.font.pixelSize * scaling_factor; var font_size = shadersettings.font.pixelSize * scaling_factor;
var line_spacing = Math.round(shadersettings.font.lineSpacing * font_size); var line_spacing = Math.round(shadersettings.font.lineSpacing * font_size);
font.pointSize = font_size; font.pixelSize = font_size;
font.family = shadersettings.font.name; font.family = shadersettings.font.name;
setLineSpacing(line_spacing); setLineSpacing(line_spacing);
forceActiveFocus(); forceActiveFocus();

2
app/app.qmlproject.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.0.1, 2014-05-18T17:36:42. --> <!-- Written by QtCreator 3.0.1, 2014-05-27T21:59:57. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>ProjectExplorer.Project.ActiveTarget</variable> <variable>ProjectExplorer.Project.ActiveTarget</variable>