X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.h;h=0a527b9e9a73f545cc7736b6a0559cdc2caa7899;hp=13485924b3edad49771aea09f03dffec04632975;hb=57c08c48e867edf38a9ce0547719cbd1b839952d;hpb=f047a4f7add72ef7e32ad33f884e62a5773ecc72

diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h
index 13485924..0a527b9e 100644
--- a/src/uisupport/multilineedit.h
+++ b/src/uisupport/multilineedit.h
@@ -58,16 +58,20 @@ public:
   inline void insert(const QString &newText) { insertPlainText(newText); }
   inline void backspace() { keyPressEvent(new QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier)); }
   inline bool hasSelectedText() { return textCursor().hasSelection(); }
+  inline bool isSingleLine() const { return _singleLine; }
 
   virtual QSize sizeHint() const;
   virtual QSize minimumSizeHint() const;
 
 public slots:
   void setMode(Mode mode);
-  void setWrapMode(QTextOption::WrapMode = QTextOption::NoWrap);
   void setMinHeight(int numLines);
   void setMaxHeight(int numLines);
-  void enableScrollBars(bool enable = true);
+  void setScrollBarsEnabled(bool enable = true);
+  void setSpellCheckEnabled(bool enable = true);
+
+  // Note: Enabling wrap will make isSingleLine() not work correctly, so only use this if minHeight() > 1!
+  void setWordWrapEnabled(bool enable = true);
 
 signals:
   void textEntered(const QString &text);
@@ -90,8 +94,7 @@ private:
   QHash<int, QString> tempHistory;
   qint32 idx;
   Mode _mode;
-  QTextOption::WrapMode _wrapMode;
-  int _numLines;
+  bool _singleLine;
   int _minHeight;
   int _maxHeight;
   bool _scrollBarsEnabled;
@@ -102,9 +105,7 @@ private:
   void reset();
   void showHistoryEntry();
   void updateScrollBars();
-
-  inline int numLines() const { return _numLines; }
-  void setNumLines(int);
+  void updateSizeHint();
 };
 
 #endif