Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 20:16:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use valid font for Windows so that '-'s are displayed

Browse source
This commit is contained in:
David Rowe 2014-11-24 18:33:10 -08:00
parent 01867e2459
commit 732ad8f993
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Util.cpp
View file

@ -100,7 +100,8 @@ static TextRenderer* textRenderer(int mono) {
static TextRenderer* monoRenderer = TextRenderer::getInstance(MONO_FONT_FAMILY); static TextRenderer* monoRenderer = TextRenderer::getInstance(MONO_FONT_FAMILY);
static TextRenderer* proportionalRenderer = TextRenderer::getInstance(SANS_FONT_FAMILY, static TextRenderer* proportionalRenderer = TextRenderer::getInstance(SANS_FONT_FAMILY,
-1, -1, false, TextRenderer::SHADOW_EFFECT); -1, -1, false, TextRenderer::SHADOW_EFFECT);
static TextRenderer* inconsolataRenderer = TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, QFont::Bold, false); static TextRenderer* inconsolataRenderer = TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, INCONSOLATA_FONT_WEIGHT,
false);
switch (mono) { switch (mono) {
case 1: case 1:
return monoRenderer; return monoRenderer;

2
interface/src/ui/BandwidthMeter.cpp
View file

@ -50,7 +50,7 @@ BandwidthMeter::ChannelInfo BandwidthMeter::_CHANNELS[] = {
}; };
BandwidthMeter::BandwidthMeter() : BandwidthMeter::BandwidthMeter() :
_textRenderer(TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, QFont::Bold, false)), _textRenderer(TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, INCONSOLATA_FONT_WEIGHT, false)),
_scaleMaxIndex(INITIAL_SCALE_MAXIMUM_INDEX) { _scaleMaxIndex(INITIAL_SCALE_MAXIMUM_INDEX) {
_channels = static_cast<ChannelInfo*>( malloc(sizeof(_CHANNELS)) ); _channels = static_cast<ChannelInfo*>( malloc(sizeof(_CHANNELS)) );

6
interface/src/ui/TextRenderer.h
View file

@ -35,7 +35,13 @@ const char SOLID_BLOCK_CHAR = 127;
#define MONO_FONT_FAMILY "Courier" #define MONO_FONT_FAMILY "Courier"
// the Inconsolata font family // the Inconsolata font family
#ifdef Q_OS_WIN
#define INCONSOLATA_FONT_FAMILY "Fixedsys"
#define INCONSOLATA_FONT_WEIGHT QFont::Normal
#else
#define INCONSOLATA_FONT_FAMILY "Inconsolata" #define INCONSOLATA_FONT_FAMILY "Inconsolata"
#define INCONSOLATA_FONT_WEIGHT QFont::Bold
#endif
class Glyph; class Glyph;