From 1e0bc6a99db648fe68a9aab398d18f041bb17b7f Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 8 Sep 2009 23:55:44 +0200 Subject: [PATCH] Fix fonts configuration for the input widget, too Disabling the custom font wouldn't always take effect. --- src/qtui/inputwidget.cpp | 12 +++++++++++- src/qtui/inputwidget.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 22e0602b..2cff583b 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -59,8 +59,10 @@ InputWidget::InputWidget(QWidget *parent) new TabCompleter(ui.inputEdit); UiStyleSettings fs("Fonts"); + fs.notify("UseCustomInputWidgetFont", this, SLOT(setUseCustomFont(QVariant))); fs.notify("InputWidget", this, SLOT(setCustomFont(QVariant))); - setCustomFont(fs.value("InputWidget", QFont())); + if(fs.value("UseCustomInputWidgetFont", false).toBool()) + setCustomFont(fs.value("InputWidget", QFont())); UiSettings s("InputWidget"); @@ -92,6 +94,14 @@ InputWidget::InputWidget(QWidget *parent) InputWidget::~InputWidget() { } +void InputWidget::setUseCustomFont(const QVariant &v) { + if(v.toBool()) { + UiStyleSettings fs("Fonts"); + setCustomFont(fs.value("InputWidget")); + } else + setCustomFont(QFont()); +} + void InputWidget::setCustomFont(const QVariant &v) { QFont font = v.value(); if(font.family().isEmpty()) diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h index 6e785095..7b6be7b0 100644 --- a/src/qtui/inputwidget.h +++ b/src/qtui/inputwidget.h @@ -52,6 +52,7 @@ protected slots: private slots: void setCustomFont(const QVariant &font); + void setUseCustomFont(const QVariant &); void setEnableSpellCheck(const QVariant &); void setShowNickSelector(const QVariant &); void setMaxLines(const QVariant &); -- 2.20.1