X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Ftopicwidget.cpp;h=8a49d2758ae621f43730dc15f3dd674b36e8cf3a;hb=b7ba7d253e27507af6e749ee48b42073493139c0;hp=cc66bd460427f108ef65108d5b926daecbbed460;hpb=7e5d08e8e20162b5cd13413693187be90f738a1e;p=quassel.git

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index cc66bd46..8a49d275 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -20,8 +20,6 @@
 
 #include "topicwidget.h"
 
-#include <QDebug>
-
 #include "client.h"
 #include "iconloader.h"
 #include "networkmodel.h"
@@ -30,13 +28,10 @@ TopicWidget::TopicWidget(QWidget *parent)
   : AbstractItemView(parent)
 {
   ui.setupUi(this);
-  ui.topicEditButton->setPixmap(BarIcon("edit-rename"));
+  ui.topicEditButton->setIcon(SmallIcon("edit-rename"));
+  ui.topicLineEdit->setWordWrapEnabled(true);
 
-  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) {
@@ -61,7 +56,7 @@ void TopicWidget::setTopic(const QString &newtopic) {
   switchPlain();
 }
 
-void TopicWidget::on_topicLineEdit_returnPressed() {
+void TopicWidget::on_topicLineEdit_textEntered() {
   QModelIndex currentIdx = currentIndex();
   if(currentIdx.isValid() && currentIdx.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer) {
     BufferInfo bufferInfo = currentIdx.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
@@ -78,26 +73,15 @@ void TopicWidget::on_topicEditButton_clicked() {
 }
 
 void TopicWidget::switchEditable() {
-  ui.topicLabel->hide();
-  ui.topicEditButton->hide();
-  ui.topicLineEdit->show();
+  ui.stackedWidget->setCurrentIndex(1);
   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();
+  updateGeometry();
 }
 
 void TopicWidget::switchPlain() {
-  ui.topicLineEdit->hide();
-  ui.topicLabel->show();
-  ui.topicEditButton->show();
+  ui.stackedWidget->setCurrentIndex(0);
   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();
+  updateGeometry();
 }
 
 // filter for the input widget to switch back to normal mode