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

page indicator: Support different width / height for both horizontal and vertical orientations (#138)

Browse Source 
* add Uwe's changes

* fix horizontal page indicators
This commit is contained in:
Peter Hartmann 2021-10-26 08:32:54 +02:00 committed by GitHub
parent a1b67ee7fb
commit bf1c45352c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/controls/QskPageIndicatorSkinlet.cpp
View File

@ -56,8 +56,14 @@ QRectF QskPageIndicatorSkinlet::bulletRect(
{ {
using Q = QskPageIndicator; using Q = QskPageIndicator;
const qreal szNormal = indicator->strutSizeHint( Q::Bullet ).width(); const auto szNormal = indicator->strutSizeHint( Q::Bullet );
const qreal szHighlighted = indicator->strutSizeHint( Q::Highlighted ).width(); const auto szHighlighted = indicator->strutSizeHint( Q::Highlighted );
const qreal wNormal = szNormal.width();
const qreal wHighlighted = szHighlighted.width();
const qreal hNormal = szNormal.height();
const qreal hHighlighted = szHighlighted.height();
const auto currentIndex = indicator->currentIndex(); const auto currentIndex = indicator->currentIndex();
@ -66,8 +72,11 @@ QRectF QskPageIndicatorSkinlet::bulletRect(
if ( indexDiff > ( indicator->count() - 1 ) ) if ( indexDiff > ( indicator->count() - 1 ) )
indexDiff = ( indicator->count() - currentIndex ); // wrapping indexDiff = ( indicator->count() - currentIndex ); // wrapping
const qreal sz0 = ( indexDiff < 1 ) ? const qreal w0 = ( indexDiff < 1 ) ?
( 1 - indexDiff ) * szHighlighted + indexDiff * szNormal : szNormal; ( 1 - indexDiff ) * wHighlighted + indexDiff * wNormal : wNormal;
const qreal h0 = ( indexDiff < 1 ) ?
( 1 - indexDiff ) * hHighlighted + indexDiff * hNormal : hNormal;
const qreal spacing = indicator->spacingHint( Q::Panel ); const qreal spacing = indicator->spacingHint( Q::Panel );
const bool horizontal = ( indicator->orientation() == Qt::Horizontal ); const bool horizontal = ( indicator->orientation() == Qt::Horizontal );
@ -75,26 +84,29 @@ QRectF QskPageIndicatorSkinlet::bulletRect(
qreal w, h; qreal w, h;
if ( horizontal ) if ( horizontal )
{ {
w = ( indicator->count() - 1 ) * ( szNormal + spacing ) + szHighlighted; w = ( indicator->count() - 1 ) * ( wNormal + spacing ) + wHighlighted;
h = rect.height(); h = rect.height();
} }
else else
{ {
w = rect.width(); w = rect.width();
h = ( indicator->count() - 1 ) * ( szNormal + spacing ) + szHighlighted; h = ( indicator->count() - 1 ) * ( hNormal + spacing ) + hHighlighted;
} }
QRectF r( 0, 0, w, h ); QRectF r( 0, 0, w, h );
r.moveCenter( rect.center() ); r.moveCenter( rect.center() );
qreal s2; qreal x2, y2;
{ {
const qreal s = ( index > currentIndex ) ? szHighlighted : szNormal; const qreal w = ( index > currentIndex ) ? wHighlighted : wNormal;
const qreal h = ( index > currentIndex ) ? hHighlighted : hNormal;
if ( indexDiff < 1 && index >= currentIndex ) if ( indexDiff < 1 && index >= currentIndex )
{ {
// scrolling from or to this bullet: // scrolling from or to this bullet:
s2 = szNormal + qAbs( szHighlighted - szNormal ) * indexDiff; x2 = wNormal + qAbs( wHighlighted - wNormal ) * indexDiff;
y2 = hNormal + qAbs( hHighlighted - hNormal ) * indexDiff;
} }
else if ( ( currentIndex > ( indicator->count() - 1 ) && else if ( ( currentIndex > ( indicator->count() - 1 ) &&
index > ( currentIndex - indicator->count() + 1 ) ) ) index > ( currentIndex - indicator->count() + 1 ) ) )
@ -104,29 +116,32 @@ QRectF QskPageIndicatorSkinlet::bulletRect(
while ( wrappingDiff > 1 ) while ( wrappingDiff > 1 )
wrappingDiff -= 1; wrappingDiff -= 1;
s2 = szNormal + qAbs( szHighlighted - szNormal ) * wrappingDiff; x2 = wNormal + qAbs( wHighlighted - wNormal ) * wrappingDiff;
y2 = hNormal + qAbs( hHighlighted - hNormal ) * wrappingDiff;
} }
else else
{ {
s2 = s; x2 = w;
y2 = h;
} }
} }
const qreal x = r.left() + s2 + spacing + ( index - 1 ) * ( szNormal + spacing ); const qreal x = r.left() + x2 + spacing + ( index - 1 ) * ( wNormal + spacing );
const qreal y = r.top() + y2 + spacing + ( index - 1 ) * ( hNormal + spacing );
qreal adjust = ( currentIndex == index ) qreal adjust = ( currentIndex == index )
? ( szNormal - szHighlighted ) : ( szHighlighted - szNormal ); ? ( wNormal - wHighlighted ) : ( wHighlighted - wNormal );
adjust = 0.5 * qMax( 0.0, adjust ); adjust = 0.5 * qMax( 0.0, adjust );
if ( indexDiff < 1 ) if ( indexDiff < 1 )
adjust *= indexDiff; adjust *= indexDiff;
QRectF bulletRect( 0.0, 0.0, sz0, sz0 ); QRectF bulletRect( 0.0, 0.0, w0, h0 );
if ( horizontal ) if ( horizontal )
bulletRect.moveTo( x, r.top() + adjust ); bulletRect.moveTo( x, r.top() + adjust );
else else
bulletRect.moveTo( r.left() + adjust, x ); bulletRect.moveTo( r.left() + adjust, y );
return bulletRect; return bulletRect;
} }