thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use pixels to specify the font sizes

Browse source 
Basically reverts the last font related commits since pointSize isn't
as reliable as pixelSize.

Also some layout values (margins, spacings) have been moved out to Config.h.
This commit is contained in:
Konstantinos Sideris 2017-07-15 17:11:46 +03:00
parent 847ae37df2
commit 30fb46e25b
19 changed files with 156 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/TextInputWidget.cc
View file

@ -20,6 +20,7 @@
#include <QPainter>
#include <QStyleOption>
#include "Config.h"
#include "TextInputWidget.h"
FilteredTextEdit::FilteredTextEdit(QWidget *parent)
@ -58,7 +59,7 @@ TextInputWidget::TextInputWidget(QWidget *parent)
send_file_button_->setIconSize(QSize(24, 24));
QFont font;
font.setPointSize(this->font().pointSize() * TextFontRatio);
font.setPixelSize(conf::fontSize);
input_ = new FilteredTextEdit(this);
input_->setFixedHeight(45);
@ -99,10 +100,10 @@ void TextInputWidget::addSelectedEmoji(const QString &emoji)
QTextCursor cursor = input_->textCursor();
QFont emoji_font("Emoji One");
emoji_font.setPointSize(this->font().pointSize() * EmojiFontRatio);
emoji_font.setPixelSize(conf::emojiSize);
QFont text_font("Open Sans");
text_font.setPixelSize(this->font().pointSize() * TextFontRatio);
text_font.setPixelSize(conf::fontSize);
QTextCharFormat charfmt;
charfmt.setFont(emoji_font);