Changeset 10943

Timestamp:

Jul 5, 2010, 6:29:40 PM (13 years ago)

Author:

charles

Message:

(trunk qt) #3393 "SqueezeLabel? implementation eats CPU" -- fixed

Location:

trunk/qt

Files:

• squeezelabel.cc (modified) (2 diffs)
• squeezelabel.h (modified) (1 diff)

trunk/qt/squeezelabel.cc

@@ -40 +40 @@
 ****************************************************************************/
 
+#include <QPainter>
+#include <QResizeEvent>
+#include <QStyle>
+#include <QStyleOption>
+
 #include "squeezelabel.h"
 
-void
-SqueezeLabel::init()
+void SqueezeLabel::init()
 {
-    setTextInteractionFlags( Qt::TextSelectableByMouse );
+    setTextInteractionFlags(Qt::TextSelectableByMouse);
 }
 
-SqueezeLabel::SqueezeLabel(const QString& text, QWidget *parent) : QLabel(text, parent)
+SqueezeLabel::SqueezeLabel(const QString& text, QWidget *parent): QLabel(text, parent)
 {
     init();
@@ -58 +62 @@
 }
 
-void SqueezeLabel::paintEvent(QPaintEvent *event)
+void SqueezeLabel::paintEvent(QPaintEvent* paintEvent)
 {
+    QPainter painter(this);
     QFontMetrics fm = fontMetrics();
-    if (fm.width(text()) > contentsRect().width()) {
-        QString elided = fm.elidedText(text(), Qt::ElideMiddle, width());
-        QString oldText = text();
-        setText(elided);
-        QLabel::paintEvent(event);
-        setText(oldText);
-    } else {
-        QLabel::paintEvent(event);
-    }
+    QStyleOption opt;
+    opt.initFrom(this);
+    const QString elidedText = fm.elidedText( text(), Qt::ElideMiddle, width());
+    style()->drawItemText(&painter, contentsRect(), alignment(), opt.palette, isEnabled(), elidedText, foregroundRole());
 }
-

trunk/qt/squeezelabel.h

@@ -55 +55 @@
 protected:
     void init();
-    void paintEvent(QPaintEvent *event);
-
+    void paintEvent(QPaintEvent* paintEvent);
 };