Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
Fixed minimize on click on tray icon
Browse files Browse the repository at this point in the history
More info: https://bugs.gentoo.org/show_bug.cgi?id=408197#c10
Guys, please, report bugs directly to GitHub, not to your distro's bug
tracker
  • Loading branch information
kekekeks committed Mar 27, 2012
1 parent 9f82055 commit 6081982
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
12 changes: 11 additions & 1 deletion mainwindow.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ STabMainWindow::STabMainWindow(QWidget *parent) :
FocusGuard::addGuardedWidget(this); FocusGuard::addGuardedWidget(this);


startTimer(300); startTimer(300);
activeWidget=0;
_tabs->setFocusPolicy(Qt::NoFocus); _tabs->setFocusPolicy(Qt::NoFocus);


connect(_tabs, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); connect(_tabs, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
Expand Down Expand Up @@ -444,3 +443,14 @@ void STabMainWindow::tabCloseRequested(int index)
cont->widget()->close(); cont->widget()->close();
} }
} }

bool skypetab::STabMainWindow::hasActiveTab()
{
for(int i=0; i<_tabs->count();i++)
{
STWindowContainer*cont=((STWindowContainer*)(_tabs->widget(i)));
if(cont->widget()->isActiveWindow())
return true;
}
return false;
}
2 changes: 1 addition & 1 deletion mainwindow.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class STabMainWindow : public QMainWindow
~STabMainWindow(); ~STabMainWindow();
STWindowContainer *AddTab(QWidget *tab); STWindowContainer *AddTab(QWidget *tab);
void SetMainWindow(QWidget *tab); void SetMainWindow(QWidget *tab);
QWidget *activeWidget; bool hasActiveTab();
void toggleContacts(); void toggleContacts();
bool activateTab(QWidget *widget); bool activateTab(QWidget *widget);
protected: protected:
Expand Down
2 changes: 1 addition & 1 deletion skypetab.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ void SkypeTab::raiseTrayMenuActivated(QSystemTrayIcon::ActivationReason reason)
void SkypeTab::onTrayIcon() void SkypeTab::onTrayIcon()
{ {
stage2Init(); stage2Init();
if((SkypeTab::winManager==Generic) && mainWindow->isActiveWindow()) if((SkypeTab::winManager==Generic) && (mainWindow->isActiveWindow()||mainWindow->hasActiveTab()))
{ {


mainWindow->setWindowState(mainWindow->windowState() & ~Qt::WindowActive | Qt::WindowMinimized); mainWindow->setWindowState(mainWindow->windowState() & ~Qt::WindowActive | Qt::WindowMinimized);
Expand Down

0 comments on commit 6081982

Please sign in to comment.