1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #4300

ezavod (1):
      fix: set CSS font-weight of editbox  always to normal
This commit is contained in:
sudden6 2017-03-28 21:50:39 +02:00
commit c7375e7f3d
No known key found for this signature in database
GPG Key ID: 279509B499E032B9

View File

@ -673,14 +673,13 @@ void GenericChatForm::retranslateUi()
QString GenericChatForm::fontToCss(const QFont& font, const char* name)
{
return QString("%1{font-family: \"%2\"; font-size: %3px; font-style: \"%4\"; font-weight: %5;}")
return QString("%1{font-family: \"%2\"; font-size: %3px; font-style: \"%4\"; font-weight: normal;}")
.arg(name)
.arg(font.family())
.arg(font.pixelSize())
.arg(font.style() == QFont::StyleNormal ? "normal" : font.style() == QFont::StyleItalic
? "italic"
: "bold")
.arg(font.weight() * 10); // QFont weight is 0..100, but CSS font-weight is 0..1000
: "oblique");
}
void GenericChatForm::showNetcam()