diff --git a/src/main.cpp b/src/main.cpp index 7f13c84c..bd8ee158 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,8 +31,8 @@ public: EnableNonClientDpiScaling enableNonClientDpiScaling = (EnableNonClientDpiScaling)user32.resolve("EnableNonClientDpiScaling"); - if (enableNonClientDpiScaling) - enableNonClientDpiScaling(msg->hwnd); + // if (enableNonClientDpiScaling) + // enableNonClientDpiScaling(msg->hwnd); } } return false; diff --git a/src/widgets/accountpopup.cpp b/src/widgets/accountpopup.cpp index 9d1a566a..2bc8373e 100644 --- a/src/widgets/accountpopup.cpp +++ b/src/widgets/accountpopup.cpp @@ -123,7 +123,7 @@ AccountPopupWidget::AccountPopupWidget(std::shared_ptr channel) util::twitch::getUserID(userNickname, this, [=](const QString &id) { currentTwitchUser->setUserId(id); }); - this->dpiMultiplyerChanged(this->getDpiMultiplier(), this->getDpiMultiplier()); + this->dpiMultiplierChanged(this->getDpiMultiplier(), this->getDpiMultiplier()); } void AccountPopupWidget::setName(const QString &name) @@ -200,7 +200,7 @@ void AccountPopupWidget::updatePermissions() } } -void AccountPopupWidget::dpiMultiplyerChanged(float oldDpi, float newDpi) +void AccountPopupWidget::dpiMultiplierChanged(float oldDpi, float newDpi) { this->setStyleSheet(QString("* { font-size: px; }") .replace("", QString::number((int)(12 * newDpi)))); diff --git a/src/widgets/accountpopup.hpp b/src/widgets/accountpopup.hpp index d36e6c04..8af860d2 100644 --- a/src/widgets/accountpopup.hpp +++ b/src/widgets/accountpopup.hpp @@ -31,7 +31,7 @@ public: void updatePermissions(); protected: - virtual void dpiMultiplyerChanged(float oldDpi, float newDpi) override; + virtual void dpiMultiplierChanged(float oldDpi, float newDpi) override; private: Ui::AccountPopup *_ui; diff --git a/src/widgets/basewidget.cpp b/src/widgets/basewidget.cpp index 574f38d6..597e0e7b 100644 --- a/src/widgets/basewidget.cpp +++ b/src/widgets/basewidget.cpp @@ -2,10 +2,9 @@ #include "colorscheme.hpp" #include "settingsmanager.hpp" -//#include #include -//#include -//#include +#include +#include #include #include "util/nativeeventhelper.hpp" @@ -91,7 +90,7 @@ bool BaseWidget::nativeEvent(const QByteArray &eventType, void *message, long *r this->dpiMultiplier = dpi / 96.f; float scale = this->dpiMultiplier / oldDpiMultiplier; - this->dpiMultiplyerChanged(oldDpiMultiplier, this->dpiMultiplier); + this->dpiMultiplierChanged(oldDpiMultiplier, this->dpiMultiplier); this->resize(static_cast(this->width() * scale), static_cast(this->height() * scale)); diff --git a/src/widgets/basewidget.hpp b/src/widgets/basewidget.hpp index dadecfa2..e542d9a4 100644 --- a/src/widgets/basewidget.hpp +++ b/src/widgets/basewidget.hpp @@ -35,7 +35,7 @@ protected: virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; #endif - virtual void dpiMultiplyerChanged(float oldDpi, float newDpi) + virtual void dpiMultiplierChanged(float oldDpi, float newDpi) { } void initAsWindow(); diff --git a/src/widgets/settingsdialog.cpp b/src/widgets/settingsdialog.cpp index df106e8d..e825eeef 100644 --- a/src/widgets/settingsdialog.cpp +++ b/src/widgets/settingsdialog.cpp @@ -67,7 +67,7 @@ SettingsDialog::SettingsDialog() this->addTabs(); - this->dpiMultiplyerChanged(this->getDpiMultiplier(), this->getDpiMultiplier()); + this->dpiMultiplierChanged(this->getDpiMultiplier(), this->getDpiMultiplier()); } void SettingsDialog::addTabs() @@ -608,7 +608,7 @@ void SettingsDialog::showDialog() instance->setFocus(); } -void SettingsDialog::dpiMultiplyerChanged(float oldDpi, float newDpi) +void SettingsDialog::dpiMultiplierChanged(float oldDpi, float newDpi) { QFile file(":/qss/settings.qss"); file.open(QFile::ReadOnly); diff --git a/src/widgets/settingsdialog.hpp b/src/widgets/settingsdialog.hpp index 2c5b777c..b06b85d6 100644 --- a/src/widgets/settingsdialog.hpp +++ b/src/widgets/settingsdialog.hpp @@ -34,7 +34,7 @@ public: static void showDialog(); protected: - virtual void dpiMultiplyerChanged(float oldDpi, float newDpi) override; + virtual void dpiMultiplierChanged(float oldDpi, float newDpi) override; private: SettingsSnapshot snapshot;