Merge branch 'master' into features/fluent2

This commit is contained in:
Uwe Rathmann 2023-06-20 17:42:05 +02:00
commit 2e02854fec
3 changed files with 409 additions and 380 deletions

File diff suppressed because it is too large Load Diff

View File

@ -38,7 +38,7 @@ class QSK_FLUENT2_EXPORT QskFluent2Theme
};
QskFluent2Theme( Theme );
QskFluent2Theme( Theme, std::array< QRgb, NumAccentColors > );
QskFluent2Theme( Theme, const std::array< QRgb, NumAccentColors >& );
typedef std::array< QRgb, 2 > BorderGradient;

View File

@ -521,13 +521,15 @@ void Editor::setupProgressBar()
using A = QskAspect;
using Q = QskProgressBar;
setMetric( Q::Groove | A::Size, 8 );
setPadding( Q::Groove, 0 );
setGradient( Q::Groove, m_pal.darker200 );
setBoxShape( Q::Groove, 4 );
for ( auto subControl : { Q::Groove, Q::Bar } )
{
setMetric( subControl | A::Size, 6 );
setPadding( subControl, 0 );
setBoxShape( subControl, 4 );
}
setGradient( Q::Groove, m_pal.darker200 );
setGradient( Q::Bar, m_pal.highlighted );
setBoxShape( Q::Bar, 4 );
}
void Editor::setupFocusIndicator()