projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some clarifications in the terminology of the core config wizard.
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
64d4fd7
..
925c64f
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-520,7
+520,7
@@
void MainWin::closeEvent(QCloseEvent *event) {
}
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
}
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
- if
(activationReason == QSystemTrayIcon::Trigger) {
+ if(activationReason == QSystemTrayIcon::Trigger) {
toggleVisibility();
}
}
toggleVisibility();
}
}
@@
-528,11
+528,12
@@
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
void MainWin::toggleVisibility() {
if(isHidden() /*|| !isActiveWindow()*/) {
show();
void MainWin::toggleVisibility() {
if(isHidden() /*|| !isActiveWindow()*/) {
show();
- if(isMinimized())
- if
(isMaximized())
+ if(isMinimized())
{
+ if(isMaximized())
showMaximized();
else
showNormal();
showMaximized();
else
showNormal();
+ }
raise();
activateWindow();
raise();
activateWindow();