CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: reformat

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu
2023-08-14 18:16:53 +02:00
parent 779f70057b
commit 91ba4cf75e
603 changed files with 15840 additions and 16257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
launcher/ui/themes/BrightTheme.cpp
View File

@ -20,18 +20,18 @@ bool BrightTheme::hasColorScheme()
QPalette BrightTheme::colorScheme()
{
QPalette brightPalette;
brightPalette.setColor(QPalette::Window, QColor(255,255,255));
brightPalette.setColor(QPalette::WindowText, QColor(17,17,17));
brightPalette.setColor(QPalette::Base, QColor(250,250,250));
brightPalette.setColor(QPalette::AlternateBase, QColor(240,240,240));
brightPalette.setColor(QPalette::ToolTipBase, QColor(17,17,17));
brightPalette.setColor(QPalette::ToolTipText, QColor(255,255,255));
brightPalette.setColor(QPalette::Text, Qt::black);
brightPalette.setColor(QPalette::Button, QColor(249,249,249));
brightPalette.setColor(QPalette::Window, QColor(255, 255, 255));
brightPalette.setColor(QPalette::WindowText, QColor(17, 17, 17));
brightPalette.setColor(QPalette::Base, QColor(250, 250, 250));
brightPalette.setColor(QPalette::AlternateBase, QColor(240, 240, 240));
brightPalette.setColor(QPalette::ToolTipBase, QColor(17, 17, 17));
brightPalette.setColor(QPalette::ToolTipText, QColor(255, 255, 255));
brightPalette.setColor(QPalette::Text, Qt::black);
brightPalette.setColor(QPalette::Button, QColor(249, 249, 249));
brightPalette.setColor(QPalette::ButtonText, Qt::black);
brightPalette.setColor(QPalette::BrightText, Qt::red);
brightPalette.setColor(QPalette::Link, QColor(37,137,164));
brightPalette.setColor(QPalette::Highlight, QColor(137,207,84));
brightPalette.setColor(QPalette::Link, QColor(37, 137, 164));
brightPalette.setColor(QPalette::Highlight, QColor(137, 207, 84));
brightPalette.setColor(QPalette::HighlightedText, Qt::black);
return fadeInactive(brightPalette, fadeAmount(), fadeColor());
}
@ -43,7 +43,7 @@ double BrightTheme::fadeAmount()
QColor BrightTheme::fadeColor()
{
return QColor(255,255,255);
return QColor(255, 255, 255);
}
bool BrightTheme::hasStyleSheet()
@ -55,4 +55,3 @@ QString BrightTheme::appStyleSheet()
{
return QString();
}

6
launcher/ui/themes/BrightTheme.h
View File

@ -2,9 +2,8 @@
#include "FusionTheme.h"
class BrightTheme: public FusionTheme
{
public:
class BrightTheme : public FusionTheme {
public:
virtual ~BrightTheme() {}
QString id() override;
@ -16,4 +15,3 @@ public:
double fadeAmount() override;
QColor fadeColor() override;
};

3
launcher/ui/themes/CustomTheme.cpp
View File

@ -183,7 +183,8 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
return;
}
// FIXME: This is kinda jank, it only actually checks if the qss file path is not present. It should actually check for any relevant missing data (e.g. name, colors)
// FIXME: This is kinda jank, it only actually checks if the qss file path is not present. It should actually check for any relevant
// missing data (e.g. name, colors)
if (jsonDataIncomplete) {
writeThemeJson(fileInfo.absoluteFilePath(), m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath);
}

16
launcher/ui/themes/DarkTheme.cpp
View File

@ -20,21 +20,21 @@ bool DarkTheme::hasColorScheme()
QPalette DarkTheme::colorScheme()
{
QPalette darkPalette;
darkPalette.setColor(QPalette::Window, QColor(49,49,49));
darkPalette.setColor(QPalette::Window, QColor(49, 49, 49));
darkPalette.setColor(QPalette::WindowText, Qt::white);
darkPalette.setColor(QPalette::Base, QColor(34,34,34));
darkPalette.setColor(QPalette::AlternateBase, QColor(42,42,42));
darkPalette.setColor(QPalette::Base, QColor(34, 34, 34));
darkPalette.setColor(QPalette::AlternateBase, QColor(42, 42, 42));
darkPalette.setColor(QPalette::ToolTipBase, Qt::white);
darkPalette.setColor(QPalette::ToolTipText, Qt::white);
darkPalette.setColor(QPalette::Text, Qt::white);
darkPalette.setColor(QPalette::Button, QColor(48,48,48));
darkPalette.setColor(QPalette::Button, QColor(48, 48, 48));
darkPalette.setColor(QPalette::ButtonText, Qt::white);
darkPalette.setColor(QPalette::BrightText, Qt::red);
darkPalette.setColor(QPalette::Link, QColor(47,163,198));
darkPalette.setColor(QPalette::Highlight, QColor(150,219,89));
darkPalette.setColor(QPalette::Link, QColor(47, 163, 198));
darkPalette.setColor(QPalette::Highlight, QColor(150, 219, 89));
darkPalette.setColor(QPalette::HighlightedText, Qt::black);
darkPalette.setColor(QPalette::PlaceholderText, Qt::darkGray);
return fadeInactive(darkPalette, fadeAmount(), fadeColor());
return fadeInactive(darkPalette, fadeAmount(), fadeColor());
}
double DarkTheme::fadeAmount()
@ -44,7 +44,7 @@ double DarkTheme::fadeAmount()
QColor DarkTheme::fadeColor()
{
return QColor(49,49,49);
return QColor(49, 49, 49);
}
bool DarkTheme::hasStyleSheet()

5
launcher/ui/themes/DarkTheme.h
View File

@ -2,9 +2,8 @@
#include "FusionTheme.h"
class DarkTheme: public FusionTheme
{
public:
class DarkTheme : public FusionTheme {
public:
virtual ~DarkTheme() {}
QString id() override;

5
launcher/ui/themes/FusionTheme.h
View File

@ -2,9 +2,8 @@
#include "ITheme.h"
class FusionTheme: public ITheme
{
public:
class FusionTheme : public ITheme {
public:
virtual ~FusionTheme() {}
QString qtTheme() override;

7
launcher/ui/themes/ITheme.cpp
View File

@ -33,10 +33,10 @@
* limitations under the License.
*/
#include "ITheme.h"
#include "rainbow.h"
#include <QStyleFactory>
#include <QDir>
#include <QStyleFactory>
#include "Application.h"
#include "rainbow.h"
void ITheme::apply(bool)
{
@ -51,8 +51,7 @@ void ITheme::apply(bool)
QPalette ITheme::fadeInactive(QPalette in, qreal bias, QColor color)
{
auto blend = [&in, bias, color](QPalette::ColorRole role)
{
auto blend = [&in, bias, color](QPalette::ColorRole role) {
QColor from = in.color(QPalette::Active, role);
QColor blended = Rainbow::mix(from, color, bias);
in.setColor(QPalette::Disabled, role, blended);

2
launcher/ui/themes/SystemTheme.cpp
View File

@ -65,7 +65,7 @@ void SystemTheme::apply(bool initial)
// See https://github.com/MultiMC/Launcher/issues/1790
// or https://github.com/PrismLauncher/PrismLauncher/issues/490
if (initial)
return;
return;
ITheme::apply(initial);
}