squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-18 14:38:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve startup window state handling

Browse Source 
Replace current "Start qBittorrent minimized" option with "Initial window state" that allows to start qBittorrent as "hidden in system tray" while retaining regular "minimize to panel" functionality.

PR #18252.
Closes #487.
This commit is contained in:
Vladimir Golovnev
2023-01-16 14:57:56 +03:00
committed by GitHub
parent 0d376e7fd6
commit 32e4371208
15 changed files with 151 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/mainwindow.cpp
View File

@@ -1,5 +1,6 @@
/*
* Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2022 Vladimir Golovnev <glassez@yandex.ru>
* Copyright (C) 2006 Christophe Dumez <chris@qbittorrent.org>
*
* This program is free software; you can redistribute it and/or
@@ -115,7 +116,7 @@ namespace
}
}
MainWindow::MainWindow(IGUIApplication *app, const State initialState)
MainWindow::MainWindow(IGUIApplication *app, WindowState initialState)
: GUIApplicationComponent(app)
, m_ui(new Ui::MainWindow)
, m_storeExecutionLogEnabled(EXECUTIONLOG_SETTINGS_KEY(u"Enabled"_qs))
@@ -374,27 +375,27 @@ MainWindow::MainWindow(IGUIApplication *app, const State initialState)
});
#ifdef Q_OS_MACOS
// Make sure the Window is visible if we don't have a tray icon
if (initialState == Minimized)
{
showMinimized();
}
else
if (initialState == WindowState::Normal)
{
show();
activateWindow();
raise();
}
else
{
// Make sure the Window is visible if we don't have a tray icon
showMinimized();
}
#else
if (app->desktopIntegration()->isActive())
{
if ((initialState != Minimized) && !m_uiLocked)
if ((initialState == WindowState::Normal) && !m_uiLocked)
{
show();
activateWindow();
raise();
}
else if (initialState == Minimized)
else if (initialState == WindowState::Minimized)
{
showMinimized();
if (pref->minimizeToTray())
@@ -411,7 +412,7 @@ MainWindow::MainWindow(IGUIApplication *app, const State initialState)
else
{
// Make sure the Window is visible if we don't have a tray icon
if (initialState == Minimized)
if (initialState != WindowState::Normal)
{
showMinimized();
}