Use QBrush instead of QColor for background painting

Author: Simsys

src/color_manager.cpp

@@ -10,23 +10,23 @@ ColoredArea::ColoredArea()
     _posStart = 0;
     _posEnd = 0;
     _fontColor = QPen(QColor::fromRgba(qRgba(0, 0, 0, 0)));
-    _areaColor = QColor::fromRgba(qRgba(0, 0, 0, 0));
+    _areaStyle = QColor::fromRgba(qRgba(0, 0, 0, 0));
 }
 
-ColoredArea::ColoredArea(QPen pen, QColor background)
+ColoredArea::ColoredArea(QPen pen, QBrush background)
 {
     _posStart = 0;
     _posEnd = 0;
     _fontColor = pen;
-    _areaColor = background;
+    _areaStyle = background;
 }
 
-ColoredArea::ColoredArea(qint64 posStart, qint64 posEnd, QPen pen, QColor background)
+ColoredArea::ColoredArea(qint64 posStart, qint64 posEnd, QPen pen, QBrush background)
 {
     _posStart = posStart;
     _posEnd = posEnd;
     _fontColor = pen;
-    _areaColor = background;
+    _areaStyle = background;
 }
 
 QPen ColoredArea::fontPen()
@@ -46,12 +46,22 @@ void ColoredArea::setFontColor(QColor color)
 
 QColor ColoredArea::areaColor()
 {
-    return _areaColor;
+    return _areaStyle.color();
+}
+
+QBrush ColoredArea::areaStyle()
+{
+    return _areaStyle;
 }
 
 void ColoredArea::setAreaColor(QColor color)
 {
-    _areaColor = color;
+    _areaStyle.setColor(color);
+}
+
+void ColoredArea::setAreaStyle(QBrush backround)
+{
+    _areaStyle = backround;
 }
 
 qint64 ColoredArea::posStart()
@@ -87,11 +97,11 @@ ColorManager::ColorManager()
 
 void ColorManager::setPalette(const QPalette &palette)
 {
-    _selection = ColoredArea(palette.highlightedText().color(), palette.highlight().color());
+    _selection = ColoredArea(palette.highlightedText().color(), palette.highlight());
     _highlighting = ColoredArea(QColor::fromRgb(0, 0, 0), QColor(0xff, 0xff, 0x99));
-    _address = ColoredArea(palette.windowText().color(), palette.alternateBase().color());
-    _hex = ColoredArea(palette.windowText().color(), palette.base().color());
-    _ascii = ColoredArea(palette.windowText().color(), palette.alternateBase().color());
+    _address = ColoredArea(palette.windowText().color(), palette.alternateBase());
+    _hex = ColoredArea(palette.windowText().color(), palette.base());
+    _ascii = ColoredArea(palette.windowText().color(), palette.alternateBase());
 }
 
 // read only, copy of relevant ColoredArea is returned: you can't change anything
@@ -145,9 +155,9 @@ ColoredArea& ColorManager::highlighting()
     return _highlighting;
 };
 
-void ColorManager::addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QColor areaColor)
+void ColorManager::addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QBrush areaStyle)
 {
-    ColoredArea userArea = ColoredArea(posStart, posEnd, fontColor, areaColor);
+    ColoredArea userArea = ColoredArea(posStart, posEnd, fontColor, areaStyle);
     _userAreas.append(userArea);
 }
 

src/color_manager.h

@@ -31,16 +31,18 @@ class ColoredArea
 public:
     // Cunstructors
     ColoredArea();
-    ColoredArea(QPen pen, QColor background);
-    ColoredArea(qint64 posStart, qint64 posEnd, QPen pen, QColor background);
+    ColoredArea(QPen pen, QBrush background);
+    ColoredArea(qint64 posStart, qint64 posEnd, QPen pen, QBrush background);
 
     // Property to set/get font color
     QColor fontColor();
     void setFontColor(QColor color);
 
-    // Property to set/get area color
+    // Property to set/get area style
     QColor areaColor();
+    QBrush areaStyle();
     void setAreaColor(QColor color);
+    void setAreaStyle(QBrush background);
 
     // other Methods to acces and set internal data
     QPen fontPen();
@@ -53,7 +55,7 @@ class ColoredArea
     qint64 _posStart;
     qint64 _posEnd;
     QPen _fontColor;
-    QColor _areaColor;
+    QBrush _areaStyle;
 };
 
 
@@ -79,15 +81,12 @@ class ColorManager
     ColoredArea& highlighting();
 
     // Add a user defined area
-    void addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QColor areaColor);
+    void addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QBrush areaStyle);
 
     // Clear all user defined areas
     void clearUserAreas();
 
 private:
-    QPalette _darkPalette;
-    QPalette _brightPalette;
-
     ColoredArea _highlighting;
     ColoredArea _selection;
     ColoredArea _address;

src/qhexedit.cpp

@@ -350,9 +350,9 @@ void QHexEdit::replace(qint64 pos, qint64 len, const QByteArray &ba)
 }
 
 // ********************************************************************** User marking areas
-void QHexEdit::addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QColor areaColor)
+void QHexEdit::addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QBrush areaStyle)
 {
-    _colorManager->addUserArea(posStart, posEnd, fontColor, areaColor);
+    _colorManager->addUserArea(posStart, posEnd, fontColor, areaStyle);
 }
 
 void QHexEdit::clearUserAreas()
@@ -855,7 +855,7 @@ void QHexEdit::paintEvent(QPaintEvent *event)
                     _pxCharWidth * (_addrDigits + 1), 
                     height()
                 ), 
-                _colorManager->notMarked(Area::Address).areaColor()
+                _colorManager->notMarked(Area::Address).areaStyle()
             );
         if (_asciiArea)
         {
@@ -866,7 +866,7 @@ void QHexEdit::paintEvent(QPaintEvent *event)
                     _pxCharWidth * _bytesPerLine, 
                     height()
                 ),
-                _colorManager->notMarked(Area::Ascii).areaColor()
+                _colorManager->notMarked(Area::Ascii).areaStyle()
             );
         }
 
@@ -910,7 +910,7 @@ void QHexEdit::paintEvent(QPaintEvent *event)
                         3*_pxCharWidth, 
                         _pxCharHeight
                     );
-                painter.fillRect(rect, hexArea.areaColor());
+                painter.fillRect(rect, hexArea.areaStyle());
                 hex = _hexDataShown.mid((bPosLine + colIdx) * 2, 2);
                 painter.drawText(pxPosX, pxPosY, hexCaps()?hex.toUpper():hex);
                 pxPosX += 3*_pxCharWidth;
@@ -925,7 +925,7 @@ void QHexEdit::paintEvent(QPaintEvent *event)
                     if ( ch < ' ' || ch > '~' )
                         ch = '.';
                     rect.setRect(pxPosAsciiX2, pxPosY - _pxCharHeight + _pxSelectionSub, _pxCharWidth, _pxCharHeight);
-                    painter.fillRect(rect, asciiArea.areaColor());
+                    painter.fillRect(rect, asciiArea.areaStyle());
                     painter.drawText(pxPosAsciiX2, pxPosY, QChar(ch));
                     pxPosAsciiX2 += _pxCharWidth;
                 }

src/qhexedit.h

@@ -210,7 +210,7 @@ class QHEXEDIT_API QHexEdit : public QAbstractScrollArea
     prioritized in the event of overlaps. The areas defined first 
     have priority over areas that follow later.
     */
-    void addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QColor areaColor);
+    void addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QBrush areaStyle);
 
     /*! Delets all user defined areas
     */