Mercurial > octave-dspies

comparison libgui/qterminal/libqterminal/unix/TerminalView.cpp @ 18976:dcb260e7a648

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 12:10:05 -0400
parents 78fac67300e8 c59745865c7f
children
comparison
equal deleted inserted replaced
18972:19cb2530c16b 18976:dcb260e7a648
210 // experimental optimization. Konsole assumes that the terminal is using a 210 // experimental optimization. Konsole assumes that the terminal is using a
211 // mono-spaced font, in which case kerning information should have an effect. 211 // mono-spaced font, in which case kerning information should have an effect.
212 // Disabling kerning saves some computation when rendering text. 212 // Disabling kerning saves some computation when rendering text.
213 // font.setKerning(false); 213 // font.setKerning(false);
214 214
215 font.setStyleStrategy ( QFont::StyleStrategy(font.styleStrategy() 215 QFont::StyleStrategy strategy = font.styleStrategy();
216 | QFont::ForceIntegerMetrics) ); 216 #if defined (HAVE_QFONT_FORCE_INTEGER_METRICS)
217 strategy |= QFont::ForceIntegerMetrics;
218 #endif
219 font.setStyleStrategy(QFont::StyleStrategy(strategy));
217 220
218 QWidget::setFont(font); 221 QWidget::setFont(font);
219 fontChange(font); 222 fontChange(font);
220 } 223 }
221 } 224 }