168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

position renamed to tabPosition to avoid shadowing the 

QQuickItem::position
This commit is contained in:
Uwe Rathmann 2021-02-02 10:13:39 +01:00
parent f9e7c304c2
commit 8c99bd59db
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controls/QskTabBar.cpp
View File

@ -310,7 +310,7 @@ QskTabBar::~QskTabBar()
{ {
} }
void QskTabBar::setPosition( Qsk::Position position ) void QskTabBar::setTabPosition( Qsk::Position position )
{ {
if ( position == m_data->position ) if ( position == m_data->position )
return; return;
@ -334,10 +334,10 @@ void QskTabBar::setPosition( Qsk::Position position )
for ( int i = 0; i < count(); i++ ) for ( int i = 0; i < count(); i++ )
buttonAt( i )->update(); buttonAt( i )->update();
Q_EMIT positionChanged( position ); Q_EMIT tabPositionChanged( position );
} }
Qsk::Position QskTabBar::position() const Qsk::Position QskTabBar::tabPosition() const
{ {
return static_cast< Qsk::Position >( m_data->position ); return static_cast< Qsk::Position >( m_data->position );
} }

10
src/controls/QskTabBar.h
View File

@ -16,8 +16,8 @@ class QSK_EXPORT QskTabBar : public QskBox
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( Qsk::Position position READ position Q_PROPERTY( Qsk::Position tabPosition READ tabPosition
WRITE setPosition NOTIFY positionChanged FINAL ) WRITE setTabPosition NOTIFY tabPositionChanged FINAL )
Q_PROPERTY( Qt::Orientation orientation READ orientation ) Q_PROPERTY( Qt::Orientation orientation READ orientation )
@ -45,8 +45,8 @@ class QSK_EXPORT QskTabBar : public QskBox
~QskTabBar() override; ~QskTabBar() override;
void setPosition( Qsk::Position ); void setTabPosition( Qsk::Position );
Qsk::Position position() const; Qsk::Position tabPosition() const;
Qt::Orientation orientation() const; Qt::Orientation orientation() const;
@ -100,7 +100,7 @@ class QSK_EXPORT QskTabBar : public QskBox
void currentIndexChanged( int index ); void currentIndexChanged( int index );
void countChanged( int ); void countChanged( int );
void textOptionsChanged( const QskTextOptions& ); void textOptionsChanged( const QskTextOptions& );
void positionChanged( Qsk::Position ); void tabPositionChanged( Qsk::Position );
void autoScrollFocusedButtonChanged( bool ); void autoScrollFocusedButtonChanged( bool );
void autoFitTabsChanged( bool ); void autoFitTabsChanged( bool );

6
src/controls/QskTabView.cpp
View File

@ -67,7 +67,7 @@ QskTabView::QskTabView( Qsk::Position tabPosition, QQuickItem* parent )
connect( m_data->tabBar, &QskTabBar::countChanged, connect( m_data->tabBar, &QskTabBar::countChanged,
this, &QskTabView::countChanged ); this, &QskTabView::countChanged );
connect( m_data->tabBar, &QskTabBar::positionChanged, connect( m_data->tabBar, &QskTabBar::tabPositionChanged,
this, &QskTabView::tabPositionChanged ); this, &QskTabView::tabPositionChanged );
connect( m_data->tabBar, &QskTabBar::autoFitTabsChanged, connect( m_data->tabBar, &QskTabBar::autoFitTabsChanged,
@ -93,7 +93,7 @@ void QskTabView::setTabPosition( Qsk::Position position )
if ( position == tabPosition() ) if ( position == tabPosition() )
return; return;
m_data->tabBar->setPosition( position ); m_data->tabBar->setTabPosition( position );
polish(); polish();
update(); update();
@ -101,7 +101,7 @@ void QskTabView::setTabPosition( Qsk::Position position )
Qsk::Position QskTabView::tabPosition() const Qsk::Position QskTabView::tabPosition() const
{ {
return m_data->tabBar->position(); return m_data->tabBar->tabPosition();
} }
void QskTabView::setAutoFitTabs( bool on ) void QskTabView::setAutoFitTabs( bool on )