Extend TabWidget's style sheet options
# Extend TabWidget's style sheet options Extend the `TabWidget` class so that the text color of the selected tab can be set in the style sheet. Adjust the paint method to make use of the new property. Adjust the default style sheet as follows: * Background color of the selected tab is the green of the knobs * Text color of the selected tab is full on white Adjust the classic style sheet in such a way that nothing changes, i.e. the text colors of the selected tab and the other ones are the same. # Code review style changes Completely adjust the code style of TabWidget: * Pointer/reference close to type * Remove underscores from parameter names * Remove spaces from parentheses * Add space after if and for statements # Remove repeated iterator dereferences Remove repeated iterator dereferences by introducing variables with speaking names. Fixes #6730.
This commit is contained in:
committed by
GitHub
parent
bf4e57da19
commit
36cb0ed7ca
@@ -40,53 +40,56 @@ class TabWidget : public QWidget
|
||||
public:
|
||||
//! @param resizable If true, the widget resizes to fit the size of all tabs
|
||||
//! If false, all child widget will be cut down to the TabWidget's size
|
||||
TabWidget( const QString & _caption, QWidget * _parent,
|
||||
bool usePixmap = false, bool resizable = false );
|
||||
TabWidget(const QString& caption, QWidget* parent,
|
||||
bool usePixmap = false, bool resizable = false);
|
||||
~TabWidget() override = default;
|
||||
|
||||
void addTab( QWidget * w, const QString & name, const char *pixmap = nullptr, int idx = -1 );
|
||||
void addTab(QWidget* w, const QString& name, const char* pixmap = nullptr, int idx = -1);
|
||||
|
||||
void setActiveTab( int idx );
|
||||
void setActiveTab(int idx);
|
||||
|
||||
int findTabAtPos( const QPoint *pos );
|
||||
int findTabAtPos(const QPoint* pos);
|
||||
|
||||
inline int activeTab() const
|
||||
{
|
||||
return( m_activeTab );
|
||||
return(m_activeTab);
|
||||
}
|
||||
|
||||
// Themeability
|
||||
Q_PROPERTY( QColor tabText READ tabText WRITE setTabText)
|
||||
Q_PROPERTY( QColor tabTitleText READ tabTitleText WRITE setTabTitleText)
|
||||
Q_PROPERTY( QColor tabSelected READ tabSelected WRITE setTabSelected)
|
||||
Q_PROPERTY( QColor tabBackground READ tabBackground WRITE setTabBackground)
|
||||
Q_PROPERTY( QColor tabBorder READ tabBorder WRITE setTabBorder)
|
||||
Q_PROPERTY(QColor tabText READ tabText WRITE setTabText)
|
||||
Q_PROPERTY(QColor tabTitleText READ tabTitleText WRITE setTabTitleText)
|
||||
Q_PROPERTY(QColor tabSelected READ tabSelected WRITE setTabSelected)
|
||||
Q_PROPERTY(QColor tabTextSelected READ tabTextSelected WRITE setTabTextSelected)
|
||||
Q_PROPERTY(QColor tabBackground READ tabBackground WRITE setTabBackground)
|
||||
Q_PROPERTY(QColor tabBorder READ tabBorder WRITE setTabBorder)
|
||||
|
||||
QColor tabText() const;
|
||||
void setTabText( const QColor & c );
|
||||
void setTabText(const QColor & c);
|
||||
QColor tabTitleText() const;
|
||||
void setTabTitleText( const QColor & c );
|
||||
void setTabTitleText(const QColor & c);
|
||||
QColor tabSelected() const;
|
||||
void setTabSelected( const QColor & c );
|
||||
void setTabSelected(const QColor & c);
|
||||
QColor tabTextSelected() const;
|
||||
void setTabTextSelected(const QColor & c);
|
||||
QColor tabBackground() const;
|
||||
void setTabBackground( const QColor & c );
|
||||
void setTabBackground(const QColor & c);
|
||||
QColor tabBorder() const;
|
||||
void setTabBorder( const QColor & c );
|
||||
void setTabBorder(const QColor & c);
|
||||
|
||||
protected:
|
||||
bool event( QEvent * event ) override;
|
||||
void mousePressEvent( QMouseEvent * _me ) override;
|
||||
void paintEvent( QPaintEvent * _pe ) override;
|
||||
void resizeEvent( QResizeEvent * _re ) override;
|
||||
void wheelEvent( QWheelEvent * _we ) override;
|
||||
bool event(QEvent* event) override;
|
||||
void mousePressEvent(QMouseEvent* me) override;
|
||||
void paintEvent(QPaintEvent* pe) override;
|
||||
void resizeEvent(QResizeEvent* re) override;
|
||||
void wheelEvent(QWheelEvent* we) override;
|
||||
QSize minimumSizeHint() const override;
|
||||
QSize sizeHint() const override;
|
||||
|
||||
private:
|
||||
struct widgetDesc
|
||||
{
|
||||
QWidget * w; // ptr to widget
|
||||
const char * pixmap; // artwork for the widget
|
||||
QWidget* w; // ptr to widget
|
||||
const char* pixmap; // artwork for the widget
|
||||
QString name; // name for widget
|
||||
int nwidth; // width of name when painting (only valid for text tab)
|
||||
} ;
|
||||
@@ -104,6 +107,7 @@ private:
|
||||
QColor m_tabText; // The color of the tabs' text.
|
||||
QColor m_tabTitleText; // The color of the TabWidget's title text.
|
||||
QColor m_tabSelected; // The highlighting color for the selected tab.
|
||||
QColor m_tabTextSelected;// The text color for the selected tab.
|
||||
QColor m_tabBackground; // The TabWidget's background color.
|
||||
QColor m_tabBorder; // The TabWidget's borders color.
|
||||
} ;
|
||||
|
||||
Reference in New Issue
Block a user