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

bad workaround removed ad fixing the bug instead.

Browse Source
This commit is contained in:
Uwe Rathmann 2023-01-06 17:59:02 +01:00
parent 540c3ea180
commit a5ab93bba8
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/nodes/QskRoundedRectRenderer.cpp
View File

@ -207,19 +207,25 @@ namespace
: m_metrics( metrics ) : m_metrics( metrics )
, m_vertical( vector.x1() == vector.x2() ) , m_vertical( vector.x1() == vector.x2() )
{ {
const auto& c = metrics.corner; const auto& mc = metrics.corner;
auto v = m_values; auto v = m_values;
if ( m_vertical ) if ( m_vertical )
{ {
v[0].setCorner( Qt::Horizontal, false, c[TopLeft] ); const int c[] = { TopLeft, TopRight, BottomLeft, BottomRight };
v[1].setCorner( Qt::Horizontal, true, c[TopRight] );
v[2].setCorner( Qt::Vertical, false, c[TopLeft] );
v[3].setCorner( Qt::Horizontal, false, c[BottomLeft] ); v[0].setCorner( Qt::Horizontal, false, mc[ c[0] ] );
v[4].setCorner( Qt::Horizontal, true, c[BottomRight] ); v[1].setCorner( Qt::Horizontal, true, mc[ c[1] ] );
v[5].setCorner( Qt::Vertical, true, c[BottomLeft] );
const int idx1 = ( v[0].stepCount >= v[1].stepCount ) ? 0 : 1;
v[2].setCorner( Qt::Vertical, false, mc[ c[idx1] ] );
v[3].setCorner( Qt::Horizontal, false, mc[ c[2] ] );
v[4].setCorner( Qt::Horizontal, true, mc[ c[3] ] );
const int idx2 = ( v[3].stepCount >= v[4].stepCount ) ? 2 : 3;
v[5].setCorner( Qt::Vertical, true, mc[ c[idx2] ] );
m_pos0 = metrics.innerQuad.top; m_pos0 = metrics.innerQuad.top;
m_size = metrics.innerQuad.height; m_size = metrics.innerQuad.height;
@ -229,13 +235,19 @@ namespace
} }
else else
{ {
v[0].setCorner( Qt::Vertical, false, c[TopLeft] ); const int c[] = { TopLeft, BottomLeft, TopRight, BottomRight };
v[1].setCorner( Qt::Vertical, true, c[BottomLeft] );
v[2].setCorner( Qt::Horizontal, false, c[TopLeft] );
v[3].setCorner( Qt::Vertical, false, c[TopRight] ); v[0].setCorner( Qt::Vertical, false, mc[ c[0] ] );
v[4].setCorner( Qt::Vertical, true, c[BottomRight] ); v[1].setCorner( Qt::Vertical, true, mc[ c[1] ] );
v[5].setCorner( Qt::Horizontal, true, c[TopRight] );
const int idx1 = ( v[0].stepCount >= v[1].stepCount ) ? 0 : 1;
v[2].setCorner( Qt::Horizontal, false, mc[ c[idx1] ] );
v[3].setCorner( Qt::Vertical, false, mc[ c[2] ] );
v[4].setCorner( Qt::Vertical, true, mc[ c[3] ] );
const int idx2 = ( v[3].stepCount >= v[4].stepCount ) ? 2 : 3;
v[5].setCorner( Qt::Horizontal, true, mc[ c[idx2] ] );
m_pos0 = metrics.innerQuad.left; m_pos0 = metrics.innerQuad.left;
m_size = metrics.innerQuad.width; m_size = metrics.innerQuad.width;
@ -752,10 +764,8 @@ static inline int qskFillLineCount(
lineCount += qMax( metrics.corner[ BottomLeft ].stepCount, lineCount += qMax( metrics.corner[ BottomLeft ].stepCount,
metrics.corner[ BottomRight ].stepCount ) + 1; metrics.corner[ BottomRight ].stepCount ) + 1;
#if 0
if ( metrics.centerQuad.top >= metrics.centerQuad.bottom ) if ( metrics.centerQuad.top >= metrics.centerQuad.bottom )
lineCount--; lineCount--;
#endif
} }
else if ( dir.isHorizontal() ) else if ( dir.isHorizontal() )
{ {
@ -765,10 +775,8 @@ static inline int qskFillLineCount(
lineCount += qMax( metrics.corner[ TopRight ].stepCount, lineCount += qMax( metrics.corner[ TopRight ].stepCount,
metrics.corner[ BottomRight ].stepCount ) + 1; metrics.corner[ BottomRight ].stepCount ) + 1;
#if 0
if ( metrics.centerQuad.left >= metrics.centerQuad.right ) if ( metrics.centerQuad.left >= metrics.centerQuad.right )
lineCount--; lineCount--;
#endif
} }
else else
{ {