Changeset 9799 in vbox for trunk/src/VBox

Timestamp:

Jun 18, 2008 3:48:16 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Use right text color if the label is selected & paint a focus rect if the label has the focus.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/QILabel_p.h (modified) (1 diff)
• src/QILabel.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/QILabel_p.h

@@ -92 +92 @@
     void focusInEvent (QFocusEvent *aEvent);
     void focusOutEvent (QFocusEvent *aEvent);
+    void paintEvent (QPaintEvent *aEvent);
 
 protected slots:

trunk/src/VBox/Frontends/VirtualBox4/src/QILabel.cpp

@@ -33 +33 @@
 #include <QClipboard>
 #include <QApplication>
+#include <QPainter>
+#include <QStyleOptionFocusRect>
 
 /* @todo: Compare the minimal size behavior in the qt3 & qt4 version. */
@@ -244 +246 @@
 QRegExp QILabelPrivate::mElideRegExp = QRegExp ("(<compact\\s+elipsis=\"(start|middle|end)\"?>([^<]+)</compact>)");
 
+#define HOR_PADDING 1
+
 bool QILabelPrivate::fullSizeSelection () const
 {
@@ -258 +262 @@
         /* The label should be able to get the focus */
         setFocusPolicy (Qt::StrongFocus);
-        /* Change the appearance in focus state a little bit.
+        /* Change the appearance in the focus state a little bit.
          * Note: Unfortunately QLabel, precisely the text of a QLabel isn't
          * styleable. The trolls have forgotten the simplest case ... So this
-         * is done by changing the current used palette in the In/Out-focus
-         * events below. */
+         * is done by changing the currently used palette in the In/Out-focus
+         * events below. Next broken feature is drawing a simple dotted line
+         * around the label. So this is done manually in the paintEvent. Not
+         * sure if the stylesheet stuff is ready for production environments. */
         setStyleSheet (QString("QLabel::focus {\
                                background-color: palette(highlight);\
-                               }"));
-//                                 border: 1px dotted black;
+                               }\
+                               QLabel {\
+                               padding: 0px %1px 0px %1px;\
+                               }").arg (HOR_PADDING));
     }
     else
@@ -348 +356 @@
         aEvent->reason() != Qt::PopupFocusReason) /* For right mouse click */
         setPalette (qApp->palette());
+}
+
+void QILabelPrivate::paintEvent (QPaintEvent *aEvent)
+{
+    QLabel::paintEvent (aEvent);
+
+    if (mFullSizeSeclection &&
+        hasFocus())
+    {
+        QPainter painter(this);
+        /* Paint a focus rect based on the current style. */
+        QStyleOptionFocusRect option;
+        option.initFrom(this);
+        style()->drawPrimitive(QStyle::PE_FrameFocusRect, &option, &painter, this);
+    }
 }
 
@@ -400 +423 @@
             int flatWidth = fm.width (flatStr);
             /* Create the shortened text */
-            QString newStr = fm.elidedText (elideStr, toTextElideMode (elideModeStr), width() - flatWidth);
+            QString newStr = fm.elidedText (elideStr, toTextElideMode (elideModeStr), width() - (2 * HOR_PADDING) - flatWidth);
             /* Replace the compact part with the shortened text in the initial
              * string */