Merge branch 'master' into features/fluent2
This commit is contained in:
commit
2e02854fec
File diff suppressed because it is too large
Load Diff
|
@ -38,7 +38,7 @@ class QSK_FLUENT2_EXPORT QskFluent2Theme
|
||||||
};
|
};
|
||||||
|
|
||||||
QskFluent2Theme( Theme );
|
QskFluent2Theme( Theme );
|
||||||
QskFluent2Theme( Theme, std::array< QRgb, NumAccentColors > );
|
QskFluent2Theme( Theme, const std::array< QRgb, NumAccentColors >& );
|
||||||
|
|
||||||
typedef std::array< QRgb, 2 > BorderGradient;
|
typedef std::array< QRgb, 2 > BorderGradient;
|
||||||
|
|
||||||
|
|
|
@ -521,13 +521,15 @@ void Editor::setupProgressBar()
|
||||||
using A = QskAspect;
|
using A = QskAspect;
|
||||||
using Q = QskProgressBar;
|
using Q = QskProgressBar;
|
||||||
|
|
||||||
setMetric( Q::Groove | A::Size, 8 );
|
for ( auto subControl : { Q::Groove, Q::Bar } )
|
||||||
setPadding( Q::Groove, 0 );
|
{
|
||||||
setGradient( Q::Groove, m_pal.darker200 );
|
setMetric( subControl | A::Size, 6 );
|
||||||
setBoxShape( Q::Groove, 4 );
|
setPadding( subControl, 0 );
|
||||||
|
setBoxShape( subControl, 4 );
|
||||||
|
}
|
||||||
|
|
||||||
|
setGradient( Q::Groove, m_pal.darker200 );
|
||||||
setGradient( Q::Bar, m_pal.highlighted );
|
setGradient( Q::Bar, m_pal.highlighted );
|
||||||
setBoxShape( Q::Bar, 4 );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Editor::setupFocusIndicator()
|
void Editor::setupFocusIndicator()
|
||||||
|
|
Loading…
Reference in New Issue