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

Merge 0.8.3 upstream

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-10-02 10:13:04 +03:00
parent 51a9beeedd 55bed077ca
commit 8e92ea5ab4
37 changed files with 1293 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/utils/colorutils.cpp
View File

@@ -24,11 +24,8 @@ inline qreal getColorLuma(const QColor& c)
bool ColorUtils::colorIsDark(const QColor& c)
{
bool isWhite = false;
if (getColorLuma(c) <= 0.60) {
isWhite = true;
}
return isWhite;
// when luma <= 0.5, we considor it as a dark color
return getColorLuma(c) <= 0.5;
}
QColor ColorUtils::contrastColor(const QColor& c)

5
src/utils/screengrabber.cpp
View File

@@ -90,7 +90,10 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool& ok)
QRect geometry;
for (QScreen* const screen : QGuiApplication::screens()) {
geometry = geometry.united(screen->geometry());
QRect scrRect = screen->geometry();
scrRect.moveTo(scrRect.x() / screen->devicePixelRatio(),
scrRect.y() / screen->devicePixelRatio());
geometry = geometry.united(scrRect);
}
QPixmap p(QApplication::primaryScreen()->grabWindow(