kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13:33:50 +03:00
Code Issues Projects Releases Wiki Activity

draw custom text color for default custombackground

Browse Source
This commit is contained in:
Michail Vourlakos 2021-03-24 13:18:07 +02:00
parent 82ce6b5140
commit b8229ac199
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/layout/genericlayout.cpp
View File

@ -184,7 +184,7 @@ QString GenericLayout::background() const
QString GenericLayout::textColor() const QString GenericLayout::textColor() const
{ {
if (backgroundStyle() == Layout::PatternBackgroundStyle && customBackground().isEmpty()) { if (backgroundStyle() == Layout::PatternBackgroundStyle && customBackground().isEmpty() && customTextColor().isEmpty()) {
return AbstractLayout::defaultCustomTextColor(); return AbstractLayout::defaultCustomTextColor();
} }

6
app/settings/detailsdialog/detailshandler.cpp
View File

@ -180,9 +180,13 @@ void DetailsHandler::loadLayout(const Latte::Data::Layout &data)
if (data.background.isEmpty()) { if (data.background.isEmpty()) {
m_ui->backPatternWidget->setBackground(m_colorsModel->colorPath(Latte::Layout::AbstractLayout::defaultCustomBackground())); m_ui->backPatternWidget->setBackground(m_colorsModel->colorPath(Latte::Layout::AbstractLayout::defaultCustomBackground()));
m_ui->backPatternWidget->setTextColor(Latte::Layout::AbstractLayout::defaultCustomTextColor());
} else { } else {
m_ui->backPatternWidget->setBackground(data.background); m_ui->backPatternWidget->setBackground(data.background);
}
if (data.background.isEmpty() && data.textColor.isEmpty()) {
m_ui->backPatternWidget->setTextColor(Latte::Layout::AbstractLayout::defaultCustomTextColor());
} else {
m_ui->backPatternWidget->setTextColor(data.textColor); m_ui->backPatternWidget->setTextColor(data.textColor);
} }