mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixed bug in conversion of Bag contents, fixed mispositioning of text cursor in keyboard text entry, fixed not being able to move right in keyboard text entry, fixed mispositioning of icons in text, fixed events not being able to see at a distance
This commit is contained in:
@@ -507,7 +507,7 @@ def getFormattedText(bitmap,xDst,yDst,widthDst,heightDst,text,lineheight=32,
|
||||
nextline=0
|
||||
graphic=nil
|
||||
graphicX=0
|
||||
graphicY=0
|
||||
graphicY=4
|
||||
graphicWidth=nil
|
||||
graphicHeight=nil
|
||||
graphicRect=nil
|
||||
@@ -1089,11 +1089,11 @@ def drawSingleFormattedChar(bitmap,ch)
|
||||
bitmap.font.color=ch[8] if bitmap.font.color!=ch[8]
|
||||
end
|
||||
if ch[10] # underline
|
||||
bitmap.fill_rect(ch[1],ch[2]+ch[4]-[(ch[4]-bitmap.font.size)/2,0].max-2,
|
||||
bitmap.fill_rect(ch[1],ch[2]+ch[4]-4-[(ch[4]-bitmap.font.size)/2,0].max-2,
|
||||
ch[3]-2,2,ch[8])
|
||||
end
|
||||
if ch[11] # strikeout
|
||||
bitmap.fill_rect(ch[1],ch[2]+(ch[4]/2),ch[3]-2,2,ch[8])
|
||||
bitmap.fill_rect(ch[1],ch[2]+(ch[4]/2)-4,ch[3]-2,2,ch[8])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -210,13 +210,13 @@ class Window_TextEntry < SpriteWindow_Base
|
||||
pbDrawShadowText(bitmap,x,y, textwidth+4, 32, c,@baseColor,@shadowColor)
|
||||
# Draw cursor if necessary
|
||||
if ((@frame/10)&1) == 0 && i==@helper.cursor
|
||||
bitmap.fill_rect(x,y-2,2,24,cursorcolor)
|
||||
bitmap.fill_rect(x,y+4,2,24,cursorcolor)
|
||||
end
|
||||
# Add x to drawn text width
|
||||
x += textwidth
|
||||
end
|
||||
if ((@frame/10)&1) == 0 && textscan.length==@helper.cursor
|
||||
bitmap.fill_rect(x,y-2,2,24,cursorcolor)
|
||||
bitmap.fill_rect(x,y+4,2,24,cursorcolor)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -240,7 +240,7 @@ class Window_TextEntry_Keyboard < Window_TextEntry
|
||||
self.refresh
|
||||
end
|
||||
return
|
||||
elsif Input.triggerex?(:LEFT) || Input.repeatex?(:RIGHT)
|
||||
elsif Input.triggerex?(:RIGHT) || Input.repeatex?(:RIGHT)
|
||||
if @helper.cursor < self.text.scan(/./m).length
|
||||
@helper.cursor+=1
|
||||
@frame=0
|
||||
|
||||
Reference in New Issue
Block a user