summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
af29862)
Remove code duplication, avoid a warning about unreachable code.
bool GraphicalUi::checkMainWidgetVisibility(bool perform)
{
bool GraphicalUi::checkMainWidgetVisibility(bool perform)
{
+ bool needsActivation{true};
+
#ifdef Q_OS_WIN
// the problem is that we lose focus when the systray icon is activated
// and we don't know the former active window
// therefore we watch for activation event and use our stopwatch :)
if (GetTickCount() - _dwTickCount < 300) {
// we were active in the last 300ms -> hide it
#ifdef Q_OS_WIN
// the problem is that we lose focus when the systray icon is activated
// and we don't know the former active window
// therefore we watch for activation event and use our stopwatch :)
if (GetTickCount() - _dwTickCount < 300) {
// we were active in the last 300ms -> hide it
- if (perform)
- minimizeRestore(false);
- return false;
- }
- else {
- if (perform)
- minimizeRestore(true);
- return true;
+ needsActivation = false;
-
- if (!mainWidget()->isVisible() || mainWidget()->isMinimized() || !mainWidget()->isActiveWindow()) {
- if (perform)
- minimizeRestore(true);
- return true;
+ if (mainWidget()->isVisible() && !mainWidget()->isMinimized() && mainWidget()->isActiveWindow()) {
+ needsActivation = false;
- else {
- if (perform)
- minimizeRestore(false);
- return false;
- }
-
+ if (perform) {
+ minimizeRestore(needsActivation);
+ }
+ return needsActivation;
}
bool GraphicalUi::isMainWidgetVisible()
}
bool GraphicalUi::isMainWidgetVisible()