mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-11-30 20:36:36 -05:00
Replaced font handling by FontSizeHandler and reenabled deactivated item delegates
This commit is contained in:
parent
93154fddc4
commit
973246624f
31 changed files with 196 additions and 383 deletions
|
|
@ -167,7 +167,7 @@ RichTextEdit::RichTextEdit(QWidget *parent) : QWidget(parent) {
|
|||
|
||||
QFontDatabase db;
|
||||
foreach(int size, db.standardSizes())
|
||||
f_fontsize->addItem(QString::number(size));
|
||||
f_fontsize->addItem(QString::number(size), size);
|
||||
|
||||
connect(f_fontsize, SIGNAL(activated(QString)),
|
||||
this, SLOT(textSize(QString)));
|
||||
|
|
@ -195,6 +195,9 @@ RichTextEdit::RichTextEdit(QWidget *parent) : QWidget(parent) {
|
|||
// check message length
|
||||
connect(f_textedit, SIGNAL(textChanged()), this, SLOT(checkLength()));
|
||||
|
||||
mMessageFontSizeHandler.registerFontSize(f_textedit, [this] (QWidget*, int fontSize) {
|
||||
f_fontsize->setCurrentIndex(f_fontsize->findData(fontSize));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -614,26 +617,3 @@ void RichTextEdit::checkLength(){
|
|||
void RichTextEdit::setPlaceHolderTextPosted() {
|
||||
f_textedit->setPlaceholderText(tr("Text (optional)"));
|
||||
}
|
||||
|
||||
void RichTextEdit::showEvent(QShowEvent *event)
|
||||
{
|
||||
if (!event->spontaneous()) {
|
||||
updateFontSize();
|
||||
}
|
||||
}
|
||||
|
||||
void RichTextEdit::updateFontSize()
|
||||
{
|
||||
#if defined(Q_OS_DARWIN)
|
||||
int customFontSize = Settings->valueFromGroup("Messages", "MinimumFontSize", 13).toInt();
|
||||
#else
|
||||
int customFontSize = Settings->valueFromGroup("Messages", "MinimumFontSize", 12).toInt();
|
||||
#endif
|
||||
QFont newFont = f_textedit->font();
|
||||
if (newFont.pointSize() != customFontSize) {
|
||||
newFont.setPointSize(customFontSize);
|
||||
QFontMetricsF fontMetrics(newFont);
|
||||
f_textedit->setFont(newFont);
|
||||
f_fontsize->setCurrentIndex(f_fontsize->findText(QString::number(newFont.pointSize())));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue