summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRandy Morgan <[email protected]>2012-02-13 19:31:32 +0900
committerRandy Morgan <[email protected]>2012-02-13 19:31:32 +0900
commit6117fc28b5c5e1cf2ca21d9e35ecccf8c626d6fe (patch)
tree568f77629776e50e0834b4235f373fac89444ef3 /lib
parentf6ead744b3439ff656165796a4d4bc1c9f47589e (diff)
downloadcaxlsx-6117fc28b5c5e1cf2ca21d9e35ecccf8c626d6fe.tar.gz
caxlsx-6117fc28b5c5e1cf2ca21d9e35ecccf8c626d6fe.zip
adding in support for specified column widths
Diffstat (limited to 'lib')
-rw-r--r--lib/axlsx/workbook/worksheet/worksheet.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index 29bea8d3..11a2292e 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -303,7 +303,7 @@ module Axlsx
# ignore formula - there is no way for us to know the result
next if item.value.is_a?(String) && item.value.start_with?('=')
- col = @auto_fit_data[index] || {:longest=>"", :sz=>sz}
+ col = @auto_fit_data[index] || {:longest=>"", :sz=>sz, :fixed=>nil}
cell_xf = cellXfs[item.style]
font = fonts[cell_xf.fontId || 0]
sz = item.sz || font.sz || fonts[0].sz
@@ -322,6 +322,8 @@ module Axlsx
# @return [Float]
# @param [Hash] A hash of auto_fit_data
def auto_width(col)
+ return col[:fixed] unless col[:fixed] == nil
+
mdw_count, font_scale, mdw = 0, col[:sz]/11.0, 6.0
mdw_count = col[:longest].scan(/./mu).reduce(0) do | count, char |
count +=1 if @magick_draw.get_type_metrics(char).max_advance >= mdw