Ticket #1030: 0001-Prevent-line-wrapping-for-short-labels.patch

svgcard.py

@@ -221 +221 @@
             stroke_color = self.default_propsfront_text.get('front_border').get('stroke_color')
             self.set_border(fill_color, stroke_color)
             self.flop()
-            
+
+    # Attempt to fit some text (of length text_length) which is already present
+    # in a layout (with width max_width) so that it doesn't wrap or overflow.
+    # Works through a set of descending candidate sizes until a suitable
+    # size is found. The starting point within the candidate size array is
+    # guessed based on the length of the text.
+    def _fit_to_layout(self, layout, text_length, max_width, candidate_sizes):
+        # optimize for 1-character only: we can never wrap, and we'll assume
+        # that the largest font provided is suitable
+        if text_length <= 1:
+            desc = pango.FontDescription('Deja Vu Sans bold ' +
+                str(candidate_sizes[0]))
+            layout.set_font_description(desc)
+            return
+
+        text_length = text_length -1
+
+        # if we've got more text than we have suggested sizes for, then just
+        # assume the smallest size is the one we want
+        if text_length >= len(candidate_sizes):
+            desc = pango.FontDescription('Deja Vu Sans bold ' +
+                str(candidate_sizes[len(candidate_sizes) - 1]))
+            layout.set_font_description(desc)
+            return
+
+        idx = text_length
+        while idx < len(candidate_sizes):
+            # Try the candidate font size
+            fsize = str(candidate_sizes[idx])
+            desc = pango.FontDescription('Deja Vu Sans bold ' + fsize)
+            layout.set_font_description(desc)
+
+            # figure out how big that makes us
+            width, height = layout.get_pixel_size()
+
+            # check if that font size fits OK
+            # I don't know why, but we have to also test the line count.
+            # Sometimes it wraps even though we never set a width to wrap at.
+            if width < max_width and layout.get_line_count() == 1:
+                break
+            idx = idx + 1
+
     def get_text_layout(self, text, size):
         if self.size >= 170:
             font_sizes = [80, 60, 46, 36, 28, 22, 18, 12] 
@@ -232 +273 @@
         elif self.size >= 50:
             font_sizes = [30, 24, 18, 16, 14, 12, 12, 10]
         else:
-            font_sizes = [16, 12, 10, 8, 8, 8, 8, 8]
-
-        # Set font size considering string length
-        if len(text) <= 8:
-            font_size = font_sizes[len(text)-1]
-        else: 
-            font_size = 10
+            font_sizes = [16, 12, 10, 8]
 
         # Set Pango context and Pango layout
         context = self.create_pango_context()
         layout = self.create_pango_layout(text)
-        desc = pango.FontDescription('Deja Vu Sans bold '+str(font_size))
-        layout.set_font_description(desc)    
         layout.set_alignment(pango.ALIGN_CENTER)
-        layout.set_width(size*1000)
+        self._fit_to_layout(layout, len(text), size, font_sizes)
         return layout
 
     def set_background(self, color):