[mythtv-firehose] mythtv/master commit: afcda5ef0 by John Poet (jpoet)

[MythTV]

      Author:  John Poet <jpoet at mythtv.org>
 Change Date:  2012-01-24T21:42:13-08:00
   Push Date:  2012/01/24 21:48:56 -0800
  Repository:  mythtv
      Branch:  master
New Revision:  afcda5ef00c21fa82b4a335e3297a6654f2e5cc7
   Changeset:  https://github.com/MythTV/mythtv/commit/afcda5ef0

Log:

MythUIText:  Fix a fringe case when a single line of text is *just* the
wrong size, and is being cutdown.

QFontMetrics seems to think more 'text' fits in a given width, than
QTextLine.  I don't know how to determine exactly what the difference is, so
tell QFontMetrics that the width is averageCharWidth() less than it really
is.

Also force the text to be rendered, even when QTextLine thinks it doesn't
fit, in case averageCharWidth() is too small.  This may result in not all of
the '...' from being rendered, but it is better than rendering no text at
all.

Modified:

   mythtv/libs/libmythui/mythuitext.cpp
   mythtv/libs/libmythui/mythuitext.h