Add setting for OSD Pretty fading
This commit is contained in:
@@ -132,10 +132,6 @@ OSDPretty::OSDPretty(Mode mode, QWidget *parent)
|
||||
QObject::connect(fader_, &QTimeLine::valueChanged, this, &OSDPretty::FaderValueChanged);
|
||||
QObject::connect(fader_, &QTimeLine::finished, this, &OSDPretty::FaderFinished);
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
set_fading_enabled(true);
|
||||
#endif
|
||||
|
||||
// Load the show edges and corners
|
||||
QImage shadow_edge(":/pictures/osd_shadow_edge.png");
|
||||
QImage shadow_corner(":/pictures/osd_shadow_corner.png");
|
||||
@@ -247,6 +243,11 @@ void OSDPretty::Load() {
|
||||
background_opacity_ = s.value("background_opacity", 0.85).toFloat();
|
||||
font_.fromString(s.value("font", "Verdana,9,-1,5,50,0,0,0,0,0").toString());
|
||||
disable_duration_ = s.value("disable_duration", false).toBool();
|
||||
#ifdef Q_OS_WIN
|
||||
fading_enabled_ = s.value("fading", true).toBool();
|
||||
#else
|
||||
fading_enabled_ = s.value("fading", false).toBool();
|
||||
#endif
|
||||
|
||||
if (s.contains("popup_screen")) {
|
||||
popup_screen_name_ = s.value("popup_screen").toString();
|
||||
|
||||
@@ -76,9 +76,6 @@ class OSDPretty : public QWidget {
|
||||
void SetMessage(const QString &summary, const QString& message, const QImage &image);
|
||||
void ShowMessage(const QString &summary, const QString& message, const QImage &image);
|
||||
|
||||
// Controls the fader. This is enabled by default on Windows.
|
||||
void set_fading_enabled(bool enabled) { fading_enabled_ = enabled; }
|
||||
|
||||
// Popup duration in seconds. Only used in Mode_Popup.
|
||||
void set_popup_duration(int msec);
|
||||
|
||||
@@ -95,6 +92,7 @@ class OSDPretty : public QWidget {
|
||||
QPoint popup_pos() const { return popup_pos_; }
|
||||
QFont font() const { return font_; }
|
||||
bool disable_duration() const { return disable_duration_; }
|
||||
bool fading() const { return fading_enabled_; }
|
||||
|
||||
// When the user has been moving the popup, use these to get its current position and screen.
|
||||
// Note that these return invalid values if the popup is hidden.
|
||||
|
||||
Reference in New Issue
Block a user