mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-21 05:39:11 -04: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
|
@ -299,7 +299,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
|
|||
|
||||
QFontDatabase db;
|
||||
foreach(int size, db.standardSizes())
|
||||
ui.comboSize->addItem(QString::number(size));
|
||||
ui.comboSize->addItem(QString::number(size), size);
|
||||
|
||||
QStyleOptionComboBox opt; QSize sh;
|
||||
opt.initFrom(ui.comboSize);
|
||||
|
@ -408,6 +408,10 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
|
|||
ui.hashBox->setDropWidget(this);
|
||||
ui.hashBox->setAutoHide(true);
|
||||
|
||||
mMessageFontSizeHandler.registerFontSize(ui.msgText, [this, db] (QWidget*, int fontSize) {
|
||||
ui.comboSize->setCurrentIndex(ui.comboSize->findData(fontSize));
|
||||
});
|
||||
|
||||
#if QT_VERSION < 0x040700
|
||||
// embedded images are not supported before QT 4.7.0
|
||||
ui.imagebtn->setVisible(false);
|
||||
|
@ -2933,26 +2937,3 @@ void MessageComposer::checkLength()
|
|||
ui.actionSend->setEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
void MessageComposer::showEvent(QShowEvent *event)
|
||||
{
|
||||
if (!event->spontaneous()) {
|
||||
updateFontSize();
|
||||
}
|
||||
}
|
||||
|
||||
void MessageComposer::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 = ui.msgText->font();
|
||||
if (newFont.pointSize() != customFontSize) {
|
||||
newFont.setPointSize(customFontSize);
|
||||
QFontMetricsF fontMetrics(newFont);
|
||||
ui.msgText->setFont(newFont);
|
||||
ui.comboSize->setCurrentIndex(ui.comboSize->findText(QString::number(newFont.pointSize())));
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue