Move QWellArray and QColorWell to new QtWidgetsPrivate headerHEADdev

Move class definitions for QColorWell and its QWellArray
subclass from the source file for the QColorDialog
implementation to a new private header file, in preparation of
adding an accessibility implementation for QColorWell in
an upcoming commit.

Task-number: QTBUG-141571
Change-Id: I3df29a7338f74a31088424d5c6fcae0130b7a0a3
Reviewed-by: Oliver Eftevaag <[email protected]>

3 files changed, 150 insertions, 125 deletions

diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index ce30f50616b..c0be3debe49 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -681,6 +681,7 @@ qt_internal_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEA
 qt_internal_extend_target(Widgets CONDITION QT_FEATURE_colordialog
     SOURCES
         dialogs/qcolordialog.cpp dialogs/qcolordialog.h
+        dialogs/qcolorwell_p.h
 )
 
 qt_internal_extend_target(Widgets CONDITION QT_FEATURE_dialog
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index eac5de33d32..25d742039c5 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -39,6 +39,7 @@
 #include "qwindow.h"
 
 #include "private/qdialog_p.h"
+#include "private/qcolorwell_p.h"
 
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformservices.h>
@@ -56,16 +57,12 @@ namespace QtPrivate {
 class QColorLuminancePicker;
 class QColorPicker;
 class QColorShower;
-class QWellArray;
-class QColorWell;
 class QColorPickingEventFilter;
 } // namespace QtPrivate
 
 using QColorLuminancePicker = QtPrivate::QColorLuminancePicker;
 using QColorPicker = QtPrivate::QColorPicker;
 using QColorShower = QtPrivate::QColorShower;
-using QWellArray = QtPrivate::QWellArray;
-using QColorWell = QtPrivate::QColorWell;
 using QColorPickingEventFilter = QtPrivate::QColorPickingEventFilter;
 
 class QColorDialogPrivate : public QDialogPrivate
@@ -162,95 +159,6 @@ private:
 
 //////////// QWellArray BEGIN
 
-namespace QtPrivate {
-
-class QWellArray : public QWidget
-{
-    Q_OBJECT
-    Q_PROPERTY(int selectedColumn READ selectedColumn)
-    Q_PROPERTY(int selectedRow READ selectedRow)
-
-public:
-    QWellArray(int rows, int cols, QWidget* parent=nullptr);
-    ~QWellArray() {}
-
-    int selectedColumn() const { return selCol; }
-    int selectedRow() const { return selRow; }
-
-    virtual void setCurrent(int row, int col);
-    virtual void setSelected(int row, int col);
-
-    QSize sizeHint() const override;
-
-    inline int cellWidth() const
-        { return cellw; }
-
-    inline int cellHeight() const
-        { return cellh; }
-
-    inline int rowAt(int y) const
-        { return y / cellh; }
-
-    inline int columnAt(int x) const
-        { if (isRightToLeft()) return ncols - (x / cellw) - 1; return x / cellw; }
-
-    inline int rowY(int row) const
-        { return cellh * row; }
-
-    inline int columnX(int column) const
-        { if (isRightToLeft()) return cellw * (ncols - column - 1); return cellw * column; }
-
-    inline int numRows() const
-        { return nrows; }
-
-    inline int numCols() const
-        {return ncols; }
-
-    inline QRect cellRect() const
-        { return QRect(0, 0, cellw, cellh); }
-
-    inline QSize gridSize() const
-        { return QSize(ncols * cellw, nrows * cellh); }
-
-    QRect cellGeometry(int row, int column)
-        {
-            QRect r;
-            if (row >= 0 && row < nrows && column >= 0 && column < ncols)
-                r.setRect(columnX(column), rowY(row), cellw, cellh);
-            return r;
-        }
-
-    inline void updateCell(int row, int column) { update(cellGeometry(row, column)); }
-
-signals:
-    void selected(int row, int col);
-    void currentChanged(int row, int col);
-    void colorChanged(int index, QRgb color);
-
-protected:
-    virtual void paintCell(QPainter *, int row, int col, const QRect&);
-    virtual void paintCellContents(QPainter *, int row, int col, const QRect&);
-
-    void mousePressEvent(QMouseEvent*) override;
-    void mouseReleaseEvent(QMouseEvent*) override;
-    void keyPressEvent(QKeyEvent*) override;
-    void focusInEvent(QFocusEvent*) override;
-    void focusOutEvent(QFocusEvent*) override;
-    void paintEvent(QPaintEvent *) override;
-
-private:
-    Q_DISABLE_COPY(QWellArray)
-
-    int nrows;
-    int ncols;
-    int cellw;
-    int cellh;
-    int curRow;
-    int curCol;
-    int selRow;
-    int selCol;
-};
-
 void QWellArray::paintEvent(QPaintEvent *e)
 {
     QRect r = e->rect();
@@ -475,11 +383,12 @@ void QWellArray::keyPressEvent(QKeyEvent* e)
         e->ignore();                        // we don't accept the event
         return;
     }
-
-} // namespace QtPrivate
+}
 
 //////////// QWellArray END
 
+namespace QtPrivate {
+
 // Event filter to be installed on the dialog while in color-picking mode.
 class QColorPickingEventFilter : public QObject {
 public:
@@ -510,7 +419,7 @@ private:
     QColorDialogPrivate *m_dp;
 };
 
-} // unnamed namespace
+} // namespace QtPrivate
 
 /*!
     Returns the number of custom colors supported by QColorDialog. All
@@ -570,35 +479,6 @@ static inline void rgb2hsv(QRgb rgb, int &h, int &s, int &v)
     c.getHsv(&h, &s, &v);
 }
 
-namespace QtPrivate {
-
-class QColorWell : public QWellArray
-{
-public:
-    QColorWell(QWidget *parent, int r, int c, const QRgb *vals)
-        :QWellArray(r, c, parent), values(vals), mousePressed(false), oldCurrent(-1, -1)
-    { setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); }
-
-protected:
-    void paintCellContents(QPainter *, int row, int col, const QRect&) override;
-    void mousePressEvent(QMouseEvent *e) override;
-    void mouseMoveEvent(QMouseEvent *e) override;
-    void mouseReleaseEvent(QMouseEvent *e) override;
-#if QT_CONFIG(draganddrop)
-    void dragEnterEvent(QDragEnterEvent *e) override;
-    void dragLeaveEvent(QDragLeaveEvent *e) override;
-    void dragMoveEvent(QDragMoveEvent *e) override;
-    void dropEvent(QDropEvent *e) override;
-#endif
-
-private:
-    const QRgb *values;
-    bool mousePressed;
-    QPoint pressPos;
-    QPoint oldCurrent;
-
-};
-
 void QColorWell::paintCellContents(QPainter *p, int row, int col, const QRect &r)
 {
     int i = row + col*numRows();
@@ -686,6 +566,8 @@ void QColorWell::mouseReleaseEvent(QMouseEvent *e)
     mousePressed = false;
 }
 
+namespace QtPrivate {
+
 class QColorPicker : public QFrame
 {
     Q_OBJECT
diff --git a/src/widgets/dialogs/qcolorwell_p.h b/src/widgets/dialogs/qcolorwell_p.h
new file mode 100644
index 00000000000..31d69fabb13
--- /dev/null
+++ b/src/widgets/dialogs/qcolorwell_p.h
@@ -0,0 +1,142 @@
+// Copyright (C) 2025 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#ifndef QCOLORWELL_P_H
+#define QCOLORWELL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qrect.h>
+#include <QtWidgets/qwidget.h>
+
+QT_REQUIRE_CONFIG(colordialog);
+
+QT_BEGIN_NAMESPACE
+
+class QWellArray : public QWidget
+{
+    Q_OBJECT
+    Q_PROPERTY(int selectedColumn READ selectedColumn)
+    Q_PROPERTY(int selectedRow READ selectedRow)
+
+public:
+    QWellArray(int rows, int cols, QWidget *parent = nullptr);
+    ~QWellArray() { }
+
+    int selectedColumn() const { return selCol; }
+    int selectedRow() const { return selRow; }
+
+    virtual void setCurrent(int row, int col);
+    virtual void setSelected(int row, int col);
+
+    QSize sizeHint() const override;
+
+    inline int cellWidth() const { return cellw; }
+
+    inline int cellHeight() const { return cellh; }
+
+    inline int rowAt(int y) const { return y / cellh; }
+
+    inline int columnAt(int x) const
+    {
+        if (isRightToLeft())
+            return ncols - (x / cellw) - 1;
+        return x / cellw;
+    }
+
+    inline int rowY(int row) const { return cellh * row; }
+
+    inline int columnX(int column) const
+    {
+        if (isRightToLeft())
+            return cellw * (ncols - column - 1);
+        return cellw * column;
+    }
+
+    inline int numRows() const { return nrows; }
+
+    inline int numCols() const { return ncols; }
+
+    inline QRect cellRect() const { return QRect(0, 0, cellw, cellh); }
+
+    inline QSize gridSize() const { return QSize(ncols * cellw, nrows * cellh); }
+
+    QRect cellGeometry(int row, int column)
+    {
+        QRect r;
+        if (row >= 0 && row < nrows && column >= 0 && column < ncols)
+            r.setRect(columnX(column), rowY(row), cellw, cellh);
+        return r;
+    }
+
+    inline void updateCell(int row, int column) { update(cellGeometry(row, column)); }
+
+signals:
+    void selected(int row, int col);
+    void currentChanged(int row, int col);
+    void colorChanged(int index, QRgb color);
+
+protected:
+    virtual void paintCell(QPainter *, int row, int col, const QRect &);
+    virtual void paintCellContents(QPainter *, int row, int col, const QRect &);
+
+    void mousePressEvent(QMouseEvent *) override;
+    void mouseReleaseEvent(QMouseEvent *) override;
+    void keyPressEvent(QKeyEvent *) override;
+    void focusInEvent(QFocusEvent *) override;
+    void focusOutEvent(QFocusEvent *) override;
+    void paintEvent(QPaintEvent *) override;
+
+private:
+    Q_DISABLE_COPY(QWellArray)
+
+    int nrows;
+    int ncols;
+    int cellw;
+    int cellh;
+    int curRow;
+    int curCol;
+    int selRow;
+    int selCol;
+};
+
+class QColorWell : public QWellArray
+{
+public:
+    QColorWell(QWidget *parent, int r, int c, const QRgb *vals)
+        : QWellArray(r, c, parent), values(vals), mousePressed(false), oldCurrent(-1, -1)
+    {
+        setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
+    }
+
+protected:
+    void paintCellContents(QPainter *, int row, int col, const QRect &) override;
+    void mousePressEvent(QMouseEvent *e) override;
+    void mouseMoveEvent(QMouseEvent *e) override;
+    void mouseReleaseEvent(QMouseEvent *e) override;
+#if QT_CONFIG(draganddrop)
+    void dragEnterEvent(QDragEnterEvent *e) override;
+    void dragLeaveEvent(QDragLeaveEvent *e) override;
+    void dragMoveEvent(QDragMoveEvent *e) override;
+    void dropEvent(QDropEvent *e) override;
+#endif
+
+private:
+    const QRgb *values;
+    bool mousePressed;
+    QPoint pressPos;
+    QPoint oldCurrent;
+};
+
+QT_END_NAMESPACE
+
+#endif // QCOLORWELL_P_H