AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed gap in hit detection.

Browse Source
This commit is contained in:
Florian Nücke 2015-04-08 04:09:21 +02:00
parent 282875cab4
commit c1156aab38
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/util/PseudoMarkdown.scala
View File

@ -173,7 +173,7 @@ object PseudoMarkdown {
lineChars = maxChars(chars, maxWidth, renderer) lineChars = maxChars(chars, maxWidth, renderer)
currentX = 0 currentX = 0
} }
currentX + (renderer.getStringWidth(resolvedFormat + chars) * resolvedScale).toInt currentX + (stringWidth(chars, renderer) * resolvedScale).toInt
} }
override def render(x: Int, y: Int, indent: Int, maxWidth: Int, maxHeight: Int, renderer: FontRenderer, mouseX: Int, mouseY: Int): Option[InteractiveSegment] = { override def render(x: Int, y: Int, indent: Int, maxWidth: Int, maxHeight: Int, renderer: FontRenderer, mouseX: Int, mouseY: Int): Option[InteractiveSegment] = {
@ -208,7 +208,7 @@ object PseudoMarkdown {
protected def format = "" protected def format = ""
protected def stringWidth(s: String, renderer: FontRenderer): Int = renderer.getStringWidth(s) protected def stringWidth(s: String, renderer: FontRenderer): Int = renderer.getStringWidth(resolvedFormat + s)
def resolvedColor: Int = parent match { def resolvedColor: Int = parent match {
case segment: TextSegment => color.getOrElse(segment.resolvedColor) case segment: TextSegment => color.getOrElse(segment.resolvedColor)
@ -240,7 +240,7 @@ object PseudoMarkdown {
var lastBreak = -1 var lastBreak = -1
while (pos < s.length) { while (pos < s.length) {
pos += 1 pos += 1
val width = (stringWidth(resolvedFormat + s.take(pos), renderer) * fontScale).toInt val width = (stringWidth(s.take(pos), renderer) * fontScale).toInt
if (width >= maxWidth) return lastBreak + 1 if (width >= maxWidth) return lastBreak + 1
if (pos < s.length && breaks.contains(s.charAt(pos))) lastBreak = pos if (pos < s.length && breaks.contains(s.charAt(pos))) lastBreak = pos
} }