[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=c9b1c3e

The following commit has been merged in the master branch:
commit c9b1c3ef8a783e53ad1ebbc8556cda9df4f2cb94
Author: David Edmundson <david at davidedmundson.co.uk>
Date:   Mon Dec 16 11:13:25 2013 +0100

    Fix all focus related bugs
    
    REVIEW: 114487
    BUG: 310442
---
 app/chat-window.cpp | 3 +++
 lib/chat-widget.cpp | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index b5e99d9..52d99ed 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -101,6 +101,8 @@ ChatWindow::ChatWindow()
 
     // set up m_tabWidget
     m_tabWidget = new KTabWidget(this);
+    //clicking on the close button can result in the tab bar getting focus, this works round that
+    m_tabWidget->setFocusPolicy(Qt::TabFocus);
     m_tabWidget->setMovable(true);
     m_tabWidget->setDocumentMode(true);
     m_tabWidget->setTabsClosable(true);
@@ -232,6 +234,7 @@ void ChatWindow::addTab(ChatTab *tab)
         }
     }
 
+    tab->setFocus();
     tab->updateSendMessageShortcuts(m_sendMessage->shortcut());
 }
 
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 7c64815..7d5b04d 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -158,8 +158,10 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     // and our handler checks state of the timer created above.
     loadSpellCheckingOption();
 
-    // make the sendMessageBox a focus proxy for the chatview
+    // make clicking in the main HTML area put focus in the input text box
     d->ui.chatArea->setFocusProxy(d->ui.sendMessageBox);
+    //make activating the tab select the text area
+    setFocusProxy(d->ui.sendMessageBox);
 
     connect(d->ui.sendMessageBox, SIGNAL(returnKeyPressed()), SLOT(sendMessage()));
 

-- 
ktp-text-ui packaging