p53209761
/
qt5-ukui-platformtheme
forked from openkylin/qt5-ukui-platformtheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUGI96VDL, Remove ApplicationStyleSettings

This commit is contained in:
xibowen 2024-03-11 20:37:49 +08:00
parent 87edd2b26e
commit 68f5b8a276
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ukui-styles/proxy-style/proxy-style-plugin.cpp
View File

@ -56,9 +56,9 @@ ProxyStylePlugin::ProxyStylePlugin()
if (QApplication::style()->inherits("InternalStyle")) if (QApplication::style()->inherits("InternalStyle"))
return; return;
auto appStyleSettings = ApplicationStyleSettings::getInstance(); // auto appStyleSettings = ApplicationStyleSettings::getInstance();
if (appStyleSettings->currentStyleStretagy() != ApplicationStyleSettings::Default) // if (appStyleSettings->currentStyleStretagy() != ApplicationStyleSettings::Default)
return; // return;
auto styleName = settings->get("styleName").toString(); auto styleName = settings->get("styleName").toString();
@ -213,9 +213,9 @@ void ProxyStylePlugin::tableModeChanged(bool isTableMode)
if (QApplication::style()->inherits("InternalStyle")) if (QApplication::style()->inherits("InternalStyle"))
return; return;
auto appStyleSettings = ApplicationStyleSettings::getInstance(); // auto appStyleSettings = ApplicationStyleSettings::getInstance();
if (appStyleSettings->currentStyleStretagy() != ApplicationStyleSettings::Default) // if (appStyleSettings->currentStyleStretagy() != ApplicationStyleSettings::Default)
return; // return;
auto settings = UKUIStyleSettings::globalInstance(); auto settings = UKUIStyleSettings::globalInstance();
auto styleName = settings->get("styleName").toString(); auto styleName = settings->get("styleName").toString();

46
ukui-styles/proxy-style/proxy-style.cpp
View File

@ -109,29 +109,29 @@ ProxyStyle::ProxyStyle(const QString &key) : QProxyStyle(key == nullptr? "fusion
m_blur_helper->onBlurEnableChanged(false); m_blur_helper->onBlurEnableChanged(false);
} }
m_app_style_settings = ApplicationStyleSettings::getInstance(); // m_app_style_settings = ApplicationStyleSettings::getInstance();
if (m_app_style_settings) { // if (m_app_style_settings) {
connect(m_app_style_settings, &ApplicationStyleSettings::colorStretageChanged, [=](const ApplicationStyleSettings::ColorStretagy &stretagy) { // connect(m_app_style_settings, &ApplicationStyleSettings::colorStretageChanged, [=](const ApplicationStyleSettings::ColorStretagy &stretagy) {
/*! // /*!
\todo implemet palette switch. // \todo implemet palette switch.
*/ // */
switch (stretagy) { // switch (stretagy) {
case ApplicationStyleSettings::System: { // case ApplicationStyleSettings::System: {
break; // break;
} // }
case ApplicationStyleSettings::Bright: { // case ApplicationStyleSettings::Bright: {
break; // break;
} // }
case ApplicationStyleSettings::Dark: { // case ApplicationStyleSettings::Dark: {
break; // break;
} // }
default: // default:
break; // break;
} // }
}); // });
} else { // } else {
qWarning("org.ukui.style is null!"); // qWarning("org.ukui.style is null!");
} // }
if (QGSettings::isSchemaInstalled("org.ukui.peripherals-mouse")) { if (QGSettings::isSchemaInstalled("org.ukui.peripherals-mouse")) {
QGSettings *settings = new QGSettings("org.ukui.peripherals-mouse"); QGSettings *settings = new QGSettings("org.ukui.peripherals-mouse");

4
ukui-styles/proxy-style/proxy-style.h
View File

@ -30,7 +30,7 @@ class BlurHelper;
class GestureHelper; class GestureHelper;
class WindowManager; class WindowManager;
class ApplicationStyleSettings; //class ApplicationStyleSettings;
namespace UKUI { namespace UKUI {
@ -73,7 +73,7 @@ private:
GestureHelper *m_gesture_helper = nullptr; GestureHelper *m_gesture_helper = nullptr;
WindowManager *m_window_manager = nullptr; WindowManager *m_window_manager = nullptr;
ApplicationStyleSettings *m_app_style_settings = nullptr; // ApplicationStyleSettings *m_app_style_settings = nullptr;
bool m_blink_cursor = true; bool m_blink_cursor = true;
int m_blink_cursor_time = 1200; int m_blink_cursor_time = 1200;