Swiftdiff options
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtChatTabs.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtRosterHeader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp index e79b2ef..e73ddab 100644 --- a/Swift/QtUI/QtChatTabs.cpp +++ b/Swift/QtUI/QtChatTabs.cpp @@ -57,7 +57,7 @@ void QtChatTabs::handleWantsToActivate() { Q_ASSERT(widget); Q_ASSERT(tabs_->indexOf(widget) >= 0); //Un-minimize and bring to front. - setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive); + setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); tabs_->setCurrentWidget(widget); } diff --git a/Swift/QtUI/QtRosterHeader.cpp b/Swift/QtUI/QtRosterHeader.cpp index 2a01868..b8463b7 100644 --- a/Swift/QtUI/QtRosterHeader.cpp +++ b/Swift/QtUI/QtRosterHeader.cpp @@ -53,7 +53,7 @@ QtRosterHeader::QtRosterHeader(QWidget* parent) : QWidget(parent) { } void QtRosterHeader::mousePressEvent(QMouseEvent* event) { - if (nameLabel_->underMouse() || toolBar_->underMouse() && !statusWidget_->underMouse()) { + if (nameLabel_->underMouse() || (toolBar_->underMouse() && !statusWidget_->underMouse())) { toggleExpanded(); event->accept(); } else { |