summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-02-23 12:09:55 (GMT)
committerTobias Markmann <tm@ayena.de>2015-02-23 12:09:55 (GMT)
commite963c5e939f4e1b7cd8f8d653ec2d1cadbec4a8d (patch)
treeec2c5b9faa0e6f9c647f11722c0865f8b4bb1dd8 /Swift/QtUI/QtChatTabs.cpp
parent8718d29202d5df23cd979055b8be8a2d28d82301 (diff)
downloadswift-e963c5e939f4e1b7cd8f8d653ec2d1cadbec4a8d.zip
swift-e963c5e939f4e1b7cd8f8d653ec2d1cadbec4a8d.tar.bz2
Fix chat window title showing wrong chat titleswift-3.0beta1
Setup an application wide focus handler which updates the title if a focus change to a QtTabWidget happened. Test-Information: Tested on OS X 10.9.5 with Qt 5.4.0. Change-Id: Ib2e2f4c4a93deddb286350bdef685eb7aee504c9
Diffstat (limited to 'Swift/QtUI/QtChatTabs.cpp')
-rw-r--r--Swift/QtUI/QtChatTabs.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index 60ffbea..e869028 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -37,12 +37,13 @@ QtChatTabs::QtChatTabs(bool singleWindow, SettingsProvider* settingsProvider, bo
setWindowIcon(QIcon(":/logo-chat-16.png"));
#else
setAttribute(Qt::WA_ShowWithoutActivating);
#endif
dynamicGrid_ = new QtDynamicGridLayout(this, trellisMode);
connect(dynamicGrid_, SIGNAL(tabCloseRequested(int)), this, SLOT(handleTabCloseRequested(int)));
+ connect(dynamicGrid_, SIGNAL(onCurrentIndexChanged(int)), this, SLOT(handleCurrentTabIndexChanged(int)));
QVBoxLayout *layout = new QVBoxLayout;
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(dynamicGrid_);
setLayout(layout);
@@ -169,12 +170,16 @@ void QtChatTabs::handleWidgetShown() {
return;
}
addTab(widget);
show();
}
+void QtChatTabs::handleCurrentTabIndexChanged(int newIndex) {
+ handleTabTitleUpdated(dynamicGrid_->widget(newIndex));
+}
+
void QtChatTabs::handleWantsToActivate() {
QtTabbable* widget = qobject_cast<QtTabbable*>(sender());
Q_ASSERT(widget);
//Un-minimize and bring to front.
setWindowState(windowState() & ~Qt::WindowMinimized);
setWindowState(windowState() | Qt::WindowActive);