Changeset 6064

Timestamp:

02/20/08 04:08:08 (7 months ago)

Author:

flynd

Message:

Allow size hint on mledit based on font size and default chat dialog input to three lines of text.

Location:

branches/qt-gui_qt4/src

Files:

• userevents/usersendcommon.cpp (modified) (2 diffs)
• widgets/mledit.cpp (modified) (2 diffs)
• widgets/mledit.h (modified) (2 diffs)

branches/qt-gui_qt4/src/userevents/usersendcommon.cpp

@@ -423 +423 @@
 
   mleSend = new MLEdit(true, bottom, true);
+  mleSend->setSizeHintLines(3);
   mleSend->setCheckSpellingEnabled(Config::Chat::instance()->checkSpelling());
   mleSend->installEventFilter(this); // Enables send with enter
@@ -453 +454 @@
     splView->setStretchFactor(splView->indexOf(mleHistory), 1);
     splView->setStretchFactor(splView->indexOf(bottom), 0);
-    splView->setSizes(QList<int>() << 1 << 100);
 
     connect(mleHistory, SIGNAL(quote(const QString&)),

branches/qt-gui_qt4/src/widgets/mledit.cpp

@@ -35 +35 @@
   : BaseClass(parent),
     myFixSetTextNewlines(true),
-    myLastKeyWasReturn(false)
+    myLastKeyWasReturn(false),
+    myLinesHint(0)
 {
   setObjectName(name);
@@ -228 +229 @@
 
   // Get height of current font
-  int textHeight = fontMetrics().height();
-
-  // Set minimum height of text area to one line of text We need to
-  // add frame width and the added height of the scroll area as we're
-  // setting height on the widget, not the viewport
-  setMinimumHeight(textHeight + height() - viewport()->height() + 2 * frameWidth());
+  myFontHeight = fontMetrics().height();
+
+  // Set minimum height of text area to one line of text.
+  setMinimumHeight(heightForLines(1));
+}
+
+int MLEdit::heightForLines(int lines) const
+{
+  // We need to add frame width and the added height of the scroll area as
+  // we're calculating height for the widget, not the viewport.
+  return lines*myFontHeight + height() - viewport()->height() + 2 * frameWidth();
+}
+
+void MLEdit::setSizeHintLines(int lines)
+{
+  myLinesHint = lines;
+}
+
+QSize MLEdit::sizeHint() const
+{
+  QSize s = BaseClass::sizeHint();
+  if (myLinesHint > 0)
+    s.setHeight(heightForLines(myLinesHint));
+  return s;
 }
 

branches/qt-gui_qt4/src/widgets/mledit.h

@@ -67 +67 @@
   bool checkSpellingEnabled() const;
 
+  /**
+   * Caclulate height for widget to fit a specified number of lines with
+   * current font
+   *
+   * @param lines Number of text lines to calculate for
+   * @return Widget height in pixels
+   */
+  int heightForLines(int lines) const;
+
+  /**
+   * Set size hint as number of lines of text
+   *
+   * @param lines Lines of text that should be visible
+   */
+  void setSizeHintLines(int lines);
+
+  /**
+   * Get recommended widget size
+   *
+   * @return Recommended size
+   */
+  QSize sizeHint() const;
+
 signals:
   void ctrlEnterPressed();
@@ -74 +97 @@
   bool myFixSetTextNewlines;
   bool myLastKeyWasReturn;
+  int myFontHeight;
+  int myLinesHint;
 
   virtual void keyPressEvent(QKeyEvent* event);