Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #427 from akshayaurora/markup_width 

fix markup positioning incase of glyphs with kerning
This commit is contained in:
Mathieu Virbel 2012-03-19 03:07:28 -07:00
parent 71a5d04fe1 aeb57e5614
commit fafc8fedaa
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kivy/core/text/markup.py
View File

@ -226,9 +226,10 @@ class MarkupLabel(MarkupLabelBase):
# calculate the size of the part # calculate the size of the part
# (extract all extents of the part, # (extract all extents of the part,
# sum the width, and get the maximum height) # calculate width through extents due to kerning
# and get the maximum height)
pg = [cache[g] for g in part] pg = [cache[g] for g in part]
pw = sum([g[0] for g in pg]) pw = get_extents(part)[0]
ph = max([g[1] for g in pg]) ph = max([g[1] for g in pg])
options = copy(options) options = copy(options)

4
kivy/data/style.kv
View File

@ -93,7 +93,7 @@
padding_y: 6 padding_y: 6
canvas.before: canvas.before:
Color: Color:
rgb: self.background_color rgba: self.background_color
BorderImage: BorderImage:
border: (16, 16, 16, 16) border: (16, 16, 16, 16)
pos: self.pos pos: self.pos
@ -105,7 +105,7 @@
pos: map(int, self.cursor_pos) pos: map(int, self.cursor_pos)
size: 1, -self.line_height size: 1, -self.line_height
Color: Color:
rgb: self.foreground_color rgba: self.foreground_color
<TextInputCutCopyPaste>: <TextInputCutCopyPaste>:
size_hint: None, None size_hint: None, None