benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete the color edition menu

Browse Source
This commit is contained in:
lupoDharkael
2017-05-23 17:57:40 +02:00
parent 54bad72272
commit 1ac73d6453
3 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/capture/button.cpp
View File

@@ -146,7 +146,7 @@ QString Button::getStyle() {
QString Button::getStyle(const QColor &mainColor) {
QString baseSheet = "Button { border-radius: %3;"
"background-color: %1; color: white }"
"background-color: %1; color: %4 }"
"Button:hover { background-color: %2; }"
"Button:pressed:!hover { "
"background-color: %1; }";
@@ -154,7 +154,12 @@ QString Button::getStyle(const QColor &mainColor) {
if (mainColor.name() < QColor(30,30,30).name()) {
contrast = contrast.lighter(120);
}
return baseSheet.arg(mainColor.name()).arg(contrast.name()).arg(BUTTON_SIZE/2);
bool iconsAreWhite = QSettings().value("whiteIconColor").toBool();
QString color = "black";
if (iconsAreWhite) { color = "white"; }
return baseSheet.arg(mainColor.name()).arg(contrast.name())
.arg(BUTTON_SIZE/2).arg(color);
}
// get icon returns the icon for the type of button
QIcon Button::getIcon(const Type t) {