Anshorei
/
squib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Embed fix size, first / last issue 

One more fix needed to fix wrapping-- draw_calls all need to be calculated after all string substitutions have been made.
dev
pickfifteen 2015-03-30 16:02:24 -04:00
parent 554e8457da
commit 67c834960a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/squib/graphics/text.rb
View File

@ -109,19 +109,18 @@ module Squib
rule = embed.rules[key] rule = embed.rules[key]
spacing = rule[:width] * Pango::SCALE spacing = rule[:width] * Pango::SCALE
index = clean_str.index(key) index = clean_str.index(key)
str.sub!(key, "<span letter_spacing=\"#{spacing.to_i}\"> </span>") str.sub!(key, "<span size=\"0\">a<span letter_spacing=\"#{spacing.to_i}\">a</span></span>")
layout.markup = str layout.markup = str
clean_str = layout.text clean_str = layout.text
rect = layout.index_to_pos(index) rect = layout.index_to_pos(index)
iter = layout.iter iter = layout.iter
while iter.next_char! && iter.index < index; end while iter.next_char! && iter.index < index; end
letter_width = iter.char_extents.width - spacing # the width of our inserted space char
case layout.alignment case layout.alignment
when Pango::Layout::Alignment::CENTER, when Pango::Layout::Alignment::CENTER,
Pango::Layout::Alignment::RIGHT Pango::Layout::Alignment::RIGHT
Squib.logger.warn "Center- or right-aligned text do not always embed properly. This is a known issue with a workaround. See https://github.com/andymeneely/squib/issues/46" Squib.logger.warn "Center- or right-aligned text do not always embed properly. This is a known issue with a workaround. See https://github.com/andymeneely/squib/issues/46"
end end
x = Pango.pixels(rect.x + (letter_width / 2)) + rule[:dx] x = Pango.pixels(rect.x) + rule[:dx]
y = Pango.pixels(rect.y) + rule[:dy] y = Pango.pixels(rect.y) + rule[:dy]
draw_calls << {x: x, y: y, draw: rule[:draw]} # defer drawing until we've valigned draw_calls << {x: x, y: y, draw: rule[:draw]} # defer drawing until we've valigned
end end