Internal change to entergame, fix image-offset-y mistake, change the way default font is set in skins.

This commit is contained in:
Henrique Santiago
2012-08-05 18:43:45 -03:00
parent e78edad4c6
commit 0f980ec18b
4 changed files with 14 additions and 12 deletions

View File

@@ -53,33 +53,34 @@ MainWindow
!text: tr('Protocol')
anchors.left: parent.left
anchors.top: serverHostTextEdit.bottom
anchors.right: portLabel.left
text-auto-resize: true
margin-right: 10
margin-top: 8
ComboBox
id: protocolComboBox
anchors.left: protocolLabel.left
anchors.right: protocolLabel.right
anchors.right: parent.horizontalCenter
anchors.top: protocolLabel.bottom
margin-top: 2
margin-right: 3
width: 90
MenuLabel
id: portLabel
!text: tr('Port')
anchors.right: parent.right
anchors.left: serverPortTextEdit.left
anchors.top: serverHostTextEdit.bottom
margin-top: 8
width: 70
text-auto-resize: true
TextEdit
id: serverPortTextEdit
text: 7171
anchors.right: parent.right
anchors.left: portLabel.left
anchors.top: portLabel.bottom
margin-top: 2
anchors.left: parent.horizontalCenter
anchors.top: protocolComboBox.top
margin-left: 3
CheckBox
id: rememberPasswordBox

View File

@@ -117,13 +117,13 @@ function Skins.loadSkin(skin)
if skin.fonts then
for i=1,#skin.fonts do
g_fonts.importFont('skins/' .. lowerName .. '/fonts/' .. skin.fonts[i])
if i == 1 then
g_fonts.setDefaultFont(skin.fonts[i])
end
end
end
if skin.defaultFont then
g_fonts.setDefaultFont(skin.defaultFont)
end
if skin.styles then
for i=1,#skin.styles do
g_ui.importStyle('skins/' .. lowerName .. '/styles/' .. skin.styles[i])

View File

@@ -8,6 +8,7 @@ local skin = {
'verdana-11px-rounded',
'terminus-14px-bold'
},
defaultFont = 'verdana-11px-antialised',
styles = {
'buttons.otui',