From e8c8fe42234899323cae9f85518f4bce356a2954 Mon Sep 17 00:00:00 2001
From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Fri, 13 Sep 2019 20:38:03 +0200
Subject: [PATCH] Added slight svg transparency as requested in ref issue,
fixed bg detection logic
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
---
src/gui/wizard/owncloudsetuppage.cpp | 13 +++++++++++--
theme/black/control-next.svg | 2 +-
theme/black/control-prev.svg | 2 +-
theme/white/control-next.svg | 2 +-
theme/white/control-prev.svg | 2 +-
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
index 03a68e408..8ea290396 100644
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@@ -89,8 +89,17 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
connect(_ui.nextButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::nextSlide);
connect(_ui.prevButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::prevSlide);
- _ui.nextButton->setIcon(theme->uiThemeIcon(QString("control-next.svg"), false));
- _ui.prevButton->setIcon(theme->uiThemeIcon(QString("control-prev.svg"), false));
+ auto color = OwncloudSetupPage::palette().color(OwncloudSetupPage::backgroundRole()).lightness();
+ bool widgetHasDarkBg =
+ (OwncloudSetupPage::palette().color(OwncloudSetupPage::backgroundRole()).lightness() >= 125)
+ ? false
+ : true;
+ _ui.nextButton->setIcon(theme->uiThemeIcon(QString("control-next.svg"), widgetHasDarkBg));
+ _ui.prevButton->setIcon(theme->uiThemeIcon(QString("control-prev.svg"), widgetHasDarkBg));
+
+ // QPushButtons are a mess when it comes to consistent background coloring without stylesheets,
+ // so we do it here even though this is an exceptional styling method here
+ _ui.createAccountButton->setStyleSheet("QPushButton {background-color: #0082C9; color: white}");
_ui.slideShow->startShow();
diff --git a/theme/black/control-next.svg b/theme/black/control-next.svg
index 05886b873..19c7d0159 100644
--- a/theme/black/control-next.svg
+++ b/theme/black/control-next.svg
@@ -3,7 +3,7 @@
diff --git a/theme/black/control-prev.svg b/theme/black/control-prev.svg
index 11fb0fb96..97fe7a90d 100644
--- a/theme/black/control-prev.svg
+++ b/theme/black/control-prev.svg
@@ -3,7 +3,7 @@
diff --git a/theme/white/control-next.svg b/theme/white/control-next.svg
index 097c5ee0c..9194dbe6e 100644
--- a/theme/white/control-next.svg
+++ b/theme/white/control-next.svg
@@ -3,7 +3,7 @@
diff --git a/theme/white/control-prev.svg b/theme/white/control-prev.svg
index 348b4482f..e3a322594 100644
--- a/theme/white/control-prev.svg
+++ b/theme/white/control-prev.svg
@@ -3,7 +3,7 @@