Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix potential problems with code related to styling the tray menu

This commit is contained in:
Martchus 2024-04-09 11:35:23 +02:00
parent 3fc7fbd542
commit cc599efbef
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tray/gui/traymenu.cpp
View File

@ -149,7 +149,9 @@ void TrayMenu::setWindowType(WindowType windowType)
if (m_isWindows11Style) { if (m_isWindows11Style) {
updateContentMargins(); updateContentMargins();
if (windowType == WindowType::Popup) { if (windowType == WindowType::Popup) {
style()->polish(this); if (auto *const s = style()) {
s->polish(this);
}
} }
} }
#endif #endif
@ -230,9 +232,9 @@ void TrayMenu::paintEvent(QPaintEvent *event)
QMenu::paintEvent(event); QMenu::paintEvent(event);
} else { } else {
#ifdef TRAY_MENU_HANDLE_WINDOWS11_STYLE #ifdef TRAY_MENU_HANDLE_WINDOWS11_STYLE
const auto p = m_windowType != TrayMenu::WindowType::Popup && m_isWindows11Style ? QGuiApplication::palette() : palette(); const auto p = m_windowType != TrayMenu::WindowType::Popup && m_isWindows11Style ? QGuiApplication::palette() : QPalette(palette());
#else #else
const auto p = palette(); const auto &p = palette();
#endif #endif
QPainter(this).fillRect(event->rect(), p.color(backgroundRole())); QPainter(this).fillRect(event->rect(), p.color(backgroundRole()));
QWidget::paintEvent(event); QWidget::paintEvent(event);