mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-03 17:18:23 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge went bad

Browse Source 
Hopefully this is all that got messed up
This commit is contained in:
Luis Ángel San Martín 2019-09-19 22:32:07 +02:00
parent a632480422
commit a0f682be7b
1 changed files with 209 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
YACReaderLibrary/library_window.cpp
View File

@ -139,12 +139,14 @@ void LibraryWindow::setupUI()
else else
//if(settings->value(USE_OPEN_GL).toBool() == false) //if(settings->value(USE_OPEN_GL).toBool() == false)
showMaximized(); showMaximized();
}
/* //disabled until icons are ready and macos native code is done // If a window icon was set in main() we reuse it for the tray too.
// This allows support for third party icon themes on Freedesktop(Linux/Unix)
// systems.
// TODO: Luis, please tweak this to your liking and add OS macros if needed.
if (!QApplication::windowIcon().isNull()) {
trayIcon.setIcon(QApplication::windowIcon()); trayIcon.setIcon(QApplication::windowIcon());
} } else {
else
{
// TODO: Luis: This is a placeholder. Add MacOS, Windows and maybe a fallback // TODO: Luis: This is a placeholder. Add MacOS, Windows and maybe a fallback
// for other systems here. // for other systems here.
trayIcon.setIcon(QIcon(":/images/iconLibrary.png")); trayIcon.setIcon(QIcon(":/images/iconLibrary.png"));
@ -152,8 +154,7 @@ void LibraryWindow::setupUI()
connect(&trayIcon, &QSystemTrayIcon::activated, connect(&trayIcon, &QSystemTrayIcon::activated,
[=](QSystemTrayIcon::ActivationReason reason) { [=](QSystemTrayIcon::ActivationReason reason) {
if (reason == QSystemTrayIcon::Trigger) if (reason == QSystemTrayIcon::Trigger) {
{
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
OSXShowDockIcon(); OSXShowDockIcon();
#endif #endif
@ -167,8 +168,7 @@ void LibraryWindow::setupUI()
void LibraryWindow::changeEvent(QEvent *event) void LibraryWindow::changeEvent(QEvent *event)
{ {
if (event->type() == QEvent::WindowStateChange && isMinimized() && if (event->type() == QEvent::WindowStateChange && isMinimized() &&
trayIcon.isVisible()) trayIcon.isVisible()) {
{
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
OSXHideDockIcon(); OSXHideDockIcon();
#endif #endif