dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Jonas Kvinge
2022-03-22 21:09:05 +01:00
parent 8cb4e75f70
commit f6b70fda71
106 changed files with 446 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osd/osdbase.cpp
View File

@@ -305,8 +305,8 @@ void OSDBase::ShowMessage(const QString &summary, const QString &message, const
switch (behaviour_) {
case Native:
#ifdef Q_OS_WIN32
Q_UNUSED(icon)
// fallthrough
Q_UNUSED(icon)
// fallthrough
#else
if (image.isNull()) {
ShowMessageNative(summary, message, icon, QImage());
@@ -318,7 +318,7 @@ void OSDBase::ShowMessage(const QString &summary, const QString &message, const
#endif
case TrayPopup:
#ifdef Q_OS_MACOS
// fallthrough
// fallthrough
#else
if (tray_icon_) tray_icon_->ShowPopup(summary, message, timeout_msec_);
break;
@@ -401,7 +401,7 @@ QString OSDBase::ReplaceMessage(const MessageType type, const QString &message,
}
break;
#elif defined(Q_OS_WIN32)
// fallthrough
// fallthrough
#else
// Other OSes doesn't support native notifications.
qLog(Debug) << "Native notifications are not supported on this OS.";

14
src/osd/osdpretty.cpp
View File

@@ -108,9 +108,9 @@ OSDPretty::OSDPretty(Mode mode, QWidget *parent)
#ifdef Q_OS_WIN
// Don't show the window in the taskbar. Qt::ToolTip does this too, but it adds an extra ugly shadow.
int ex_style = GetWindowLong((HWND) winId(), GWL_EXSTYLE);
int ex_style = GetWindowLong((HWND)winId(), GWL_EXSTYLE);
ex_style |= WS_EX_NOACTIVATE;
SetWindowLong((HWND) winId(), GWL_EXSTYLE, ex_style);
SetWindowLong((HWND)winId(), GWL_EXSTYLE, ex_style);
#endif
// Mode settings
@@ -166,7 +166,7 @@ OSDPretty::~OSDPretty() {
void OSDPretty::showEvent(QShowEvent *e) {
screens_.clear();
for(QScreen *screen : QGuiApplication::screens()) {
for (QScreen *screen : QGuiApplication::screens()) {
screens_.insert(screen->name(), screen);
}
@@ -310,10 +310,10 @@ void OSDPretty::paintEvent(QPaintEvent*) {
p.drawPixmap(0, height() - kShadowCornerSize, shadow_corner_[3]);
// Shadow edges
p.drawTiledPixmap(kShadowCornerSize, 0, width() - kShadowCornerSize*2, kDropShadowSize, shadow_edge_[0]);
p.drawTiledPixmap(width() - kDropShadowSize, kShadowCornerSize, kDropShadowSize, height() - kShadowCornerSize*2, shadow_edge_[1]);
p.drawTiledPixmap(kShadowCornerSize, height() - kDropShadowSize, width() - kShadowCornerSize*2, kDropShadowSize, shadow_edge_[2]);
p.drawTiledPixmap(0, kShadowCornerSize, kDropShadowSize, height() - kShadowCornerSize*2, shadow_edge_[3]);
p.drawTiledPixmap(kShadowCornerSize, 0, width() - kShadowCornerSize * 2, kDropShadowSize, shadow_edge_[0]);
p.drawTiledPixmap(width() - kDropShadowSize, kShadowCornerSize, kDropShadowSize, height() - kShadowCornerSize * 2, shadow_edge_[1]);
p.drawTiledPixmap(kShadowCornerSize, height() - kDropShadowSize, width() - kShadowCornerSize * 2, kDropShadowSize, shadow_edge_[2]);
p.drawTiledPixmap(0, kShadowCornerSize, kDropShadowSize, height() - kShadowCornerSize * 2, shadow_edge_[3]);
// Box background
p.setBrush(background_color_);