storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issues with barrier

Browse Source
This commit is contained in:
chrys 2018-07-07 17:21:22 +02:00
parent 45971a8acc
commit ed98994241
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fenrirscreenreader/core/barrierManager.py
View File

@ -87,7 +87,7 @@ class barrierManager():
for b in leftBarriers: for b in leftBarriers:
if line[:offset + 1].count(b) > line[offset:].count(b): if line[:offset + 1].count(b) > line[offset:].count(b):
offset = xCursor - 1 offset = xCursor - 1
start = line[:offset + 1].rfind(b) start = line[:offset].rfind(b)
if start != -1: if start != -1:
if not self.hasBorder(text, xCursor, yCursor, leftBarriers, start): if not self.hasBorder(text, xCursor, yCursor, leftBarriers, start):
start = -1 start = -1
@ -98,17 +98,16 @@ class barrierManager():
return False, line return False, line
# end # end
for b in rightBarriers: for b in rightBarriers:
end = line[start + 1:].find(b) end = line[start:].find(b)
if end != -1: if end != -1:
end = start + end end = start + end
if not self.hasBorder(text, xCursor, yCursor,rightBarriers, end + 1): if not self.hasBorder(text, xCursor, yCursor,rightBarriers, end):
end = -1 end = -1
break break
if end == -1: if end == -1:
return False, line return False, line
if start == end: if start == end:
return False, line return False, line
end += offset + 1
return True, line[start:end] return True, line[start:end]