openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Remove the global TextStyle; this should fix some of the textual glitches

Browse Source
This commit is contained in:
Celtic Minstrel
2014-04-21 01:49:07 -04:00
parent f9a21dd068
commit 002ee640da
23 changed files with 411 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rsrc/dialogs/dialog.css
View File

@@ -96,7 +96,7 @@ title {
background-position: center;
text-align: center;
font-size: 12px;
font-family: Silom;
font-family: Capriola, Silom;
vertical-align: middle;
padding-top: 6px;
}
@@ -135,7 +135,7 @@ title {
padding-left: 18px;
padding-top: 0px;
padding-bottom: 5px;
font-family: Geneva;
font-family: 'DejaVu Sans', Geneva;
font-size: 10px;
}
@@ -163,7 +163,7 @@ title {
.text {
font-size: 10px;
font-family: Silom;
font-family: Capriola, Silom;
line-height: 12px;
}
@@ -183,5 +183,5 @@ title {
}
.text.plain {
font-family: Geneva;
font-family: 'DejaVu Sans', Geneva;
}

6
rsrc/dialogs/dialog.xsd
View File

@@ -130,12 +130,12 @@
<xs:attribute name="key-mod" type="mod"/>
</xs:attributeGroup>
<xs:attributeGroup name="font">
<xs:attribute name="font" default="silom">
<xs:attribute name="font" default="bold">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="dungeon"/>
<xs:enumeration value="geneva"/>
<xs:enumeration value="silom"/>
<xs:enumeration value="plain"/>
<xs:enumeration value="bold"/>
<xs:enumeration value="maidenword"/>
</xs:restriction>
</xs:simpleType>

10
rsrc/dialogs/dialog.xsl
View File

@@ -109,8 +109,8 @@
color: <xsl:value-of select='./@color'/> <xsl:value-of select='/dialog/@fore'/>;
font-family:
<xsl:choose>
<xsl:when test='@font = "plain"'>Geneva</xsl:when>
<xsl:when test='@font = "bold"'>Silom</xsl:when>
<xsl:when test='@font = "plain"'>'DejaVu Sans', Geneva</xsl:when>
<xsl:when test='@font = "bold"'>Capriola, Silom</xsl:when>
<xsl:otherwise><xsl:value-of select='./@font'/></xsl:otherwise>
</xsl:choose>;
<xsl:if test='./@state'>
@@ -138,8 +138,8 @@
color: <xsl:value-of select='./@color'/> <xsl:value-of select='/dialog/@fore'/>;
font-family:
<xsl:choose>
<xsl:when test='@font = "plain"'>Geneva</xsl:when>
<xsl:when test='@font = "bold"'>Silom</xsl:when>
<xsl:when test='@font = "plain"'>'DejaVu Sans', Geneva</xsl:when>
<xsl:when test='@font = "bold"'>Capriola, Silom</xsl:when>
<xsl:otherwise><xsl:value-of select='./@font'/></xsl:otherwise>
</xsl:choose>;
border-color: red;
@@ -195,7 +195,7 @@
<div class='tfield-inner'>
<xsl:attribute name='style'>
width: <xsl:value-of select='./@width'/>px; height: <xsl:value-of select='./@height'/>px;
font-family: Geneva;
font-family: 'DejaVu Sans', Geneva;
font-size: 12px;
</xsl:attribute>
(<xsl:value-of select='@name'/>)

6
rsrc/dialogs/edit-terrain.xml
View File

@@ -21,9 +21,9 @@
<led name='obstructed' top='107' left='293' state='off' width='120'>Blocked, obstructed</led>
<led name='opaque' top='124' left='293' state='off' width='120'>Blocked, opaque</led>
</group>
<led name='flight' top='150' left='26' state='off' width='120' font='silom'>Can fly over?</led>
<led name='boat' top='150' left='154' state='off' width='120' font='silom'>Can boat over?</led>
<led name='horse' top='150' left='307' state='off' width='120' font='silom'>Blocked to horses?</led>
<led name='flight' top='150' left='26' state='off' width='120' font='bold'>Can fly over?</led>
<led name='boat' top='150' left='154' state='off' width='120' font='bold'>Can boat over?</led>
<led name='horse' top='150' left='307' state='off' width='120' font='bold'>Blocked to horses?</led>
<text top='165' left='8' height='14' width='91'>Step sound:</text>
<group name='sound'>
<led name="step" top='167' left='102' state='off' width='60'>Footstep</led>