X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Ftopicwidget.cpp;h=7d2d90bddbe2ba3985e6e35c4b82d60de777a503;hb=0f16a547d17c536cc567bfb2746824bfca3424cd;hp=bb55280a90a47f2f60321d52562ce15f8c13b181;hpb=982ece4929696e3817875543cab527740cc7e023;p=quassel.git

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index bb55280a..7d2d90bd 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -22,6 +22,9 @@
 
 #include <QDebug>
 
+#include "client.h"
+#include "networkmodel.h"
+
 TopicWidget::TopicWidget(QWidget *parent)
   : AbstractItemView(parent)
 {
@@ -29,6 +32,8 @@ TopicWidget::TopicWidget(QWidget *parent)
   ui.topicLineEdit->hide();
   ui.topicLineEdit->installEventFilter(this);
   ui.topicLabel->show();
+  setContentsMargins(0,0,0,0);
+  parent->setMinimumHeight(layout()->sizeHint().height() + 2*qApp->style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin));
 }
 
 void TopicWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
@@ -54,7 +59,11 @@ void TopicWidget::setTopic(const QString &newtopic) {
 }
 
 void TopicWidget::on_topicLineEdit_returnPressed() {
-  emit topicChanged(ui.topicLineEdit->text());
+  QModelIndex currentIdx = currentIndex();
+  if(currentIdx.isValid() && currentIdx.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer) {
+    BufferInfo bufferInfo = currentIdx.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+    Client::userInput(bufferInfo, QString("/topic %1").arg(ui.topicLineEdit->text()));
+  }
   switchPlain();
 }
 
@@ -67,6 +76,11 @@ void TopicWidget::switchEditable() {
   ui.topicEditButton->hide();
   ui.topicLineEdit->show();
   ui.topicLineEdit->setFocus();
+
+  setFixedHeight(layout()->sizeHint().height());
+  // Update the dock widget too, else it won't resize in all styles... FIXME try to sanitize this
+  qobject_cast<QWidget *>(parent())->setMinimumHeight(height() + 2*qApp->style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin));
+  qobject_cast<QWidget *>(parent())->adjustSize();
 }
 
 void TopicWidget::switchPlain() {
@@ -74,6 +88,10 @@ void TopicWidget::switchPlain() {
   ui.topicLabel->show();
   ui.topicEditButton->show();
   ui.topicLineEdit->setText(_topic);
+  setFixedHeight(layout()->sizeHint().height());
+  // Update the dock widget too, else it won't resize in all styles... FIXME try to sanitize this
+  qobject_cast<QWidget *>(parent())->setMinimumHeight(height() + 2*qApp->style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin));
+  qobject_cast<QWidget *>(parent())->adjustSize();
 }
 
 // filter for the input widget to switch back to normal mode
@@ -95,4 +113,3 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
   
   return false;
 }
-