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

fluent2 scrollbars improved

Browse Source
This commit is contained in:
Uwe Rathmann 2023-07-20 10:41:49 +02:00
parent eb0bac4927
commit bdef864bf3
5 changed files with 84 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
skins/fluent2/QskFluent2Skin.cpp
View File

@ -1108,6 +1108,9 @@ void Editor::setupScrollViewMetrics()
setMetric( aspect, 2 );
setMetric( aspect | Q::Hovered, 6 );
setMetric( aspect | Q::Pressed, 6 );
setBoxShape( subControl, 100, Qt::RelativeSize );
setAnimation( subControl | A::Metric, 100 );
}
/*
@ -1118,26 +1121,57 @@ void Editor::setupScrollViewMetrics()
setAlignment( Q::VerticalScrollBar, Qt::AlignHCenter );
setAlignment( Q::HorizontalScrollBar, Qt::AlignVCenter );
// handles
setBoxShape( Q::HorizontalScrollHandle, 100, Qt::RelativeSize );
setBoxShape( Q::VerticalScrollHandle, 100, Qt::RelativeSize );
const auto handleExtent = 40.0;
setStrutSize( Q::HorizontalScrollHandle, handleExtent, 0.0 );
setStrutSize( Q::VerticalScrollHandle, 0.0, handleExtent );
for ( auto subControl : { Q::HorizontalScrollBar, Q::VerticalScrollBar } )
setAnimation( subControl | A::Metric, 100 );
}
void Editor::setupScrollViewColors(
QskAspect::Section section, const QskFluent2Theme& theme )
{
using A = QskAspect;
using Q = QskScrollView;
const auto fillColor = theme.palette.fillColor.controlStrong.defaultColor;
const auto& pal = theme.palette;
setGradient( Q::HorizontalScrollHandle | section, fillColor );
setGradient( Q::VerticalScrollHandle | section, fillColor );
{
const auto fillColor = pal.fillColor.controlStrong.defaultColor;
setGradient( Q::HorizontalScrollHandle | section, fillColor );
setGradient( Q::VerticalScrollHandle | section, fillColor );
}
for ( auto subControl : { Q::HorizontalScrollBar, Q::VerticalScrollBar } )
{
auto fillColor = pal.fillColor.acrylic.background;
#if 1
/*
With Fluent2 the scroll bar is supposed to be on top of scrollable
item. QskScrollViewSkinlet does not support this yet and we
always have the scrollbar on top of the panel. For the light
scheme this leads to white on white, so we better shade the scrollbar
for the moment: TODO ...
*/
const auto v = qBlue( fillColor );
if ( v > 250 )
{
if ( v == qRed( fillColor ) && v == qGreen( fillColor ) )
fillColor = qRgba( 240, 240, 240, qAlpha( fillColor ) );
}
#endif
setGradient( subControl, QskRgb::toTransparent( fillColor, 0 ) );
setGradient( subControl | Q::Hovered, fillColor );
setGradient( subControl | Q::Pressed, fillColor );
setAnimation( subControl | A::Color, 100 );
}
}
void Editor::setupSegmentedBarMetrics()

4
skins/fluent2/QskFluent2Theme.cpp
View File

@ -77,6 +77,8 @@ QskFluent2Theme::QskFluent2Theme( QskSkin::ColorScheme colorScheme,
colors.accent.tertiary = toTransparentF( accentColors.secondary, 0.80 );
colors.accent.disabled = rgbGray( 0, 0.2169 );
colors.accent.selectedTextBackground = accentColors.primary;
colors.acrylic.background = rgbGray( 252, 0.85 );
}
#if 0
@ -198,6 +200,8 @@ QskFluent2Theme::QskFluent2Theme( QskSkin::ColorScheme colorScheme,
colors.accent.tertiary = toTransparentF( accentColors.tertiary, 0.80 );
colors.accent.disabled = rgbGray( 255, 0.1581 );
colors.accent.selectedTextBackground = accentColors.primary;
colors.acrylic.background = rgbGray( 44, 0.96 );
}
#if 0

5
skins/fluent2/QskFluent2Theme.h
View File

@ -107,6 +107,11 @@ class QSK_FLUENT2_EXPORT QskFluent2Theme
QRgb disabled;
QRgb selectedTextBackground;
} accent;
struct
{
QRgb background;
} acrylic;
};
struct Elevation

66
src/controls/QskScrollViewSkinlet.cpp
View File

@ -39,6 +39,16 @@ static void qskAlignedHandle( qreal start, qreal end,
}
}
static inline Qt::Orientation qskSubcontrolOrientation( QskAspect::Subcontrol subControl )
{
using Q = QskScrollView;
if ( subControl == Q::HorizontalScrollBar || subControl == Q::HorizontalScrollHandle )
return Qt::Horizontal;
else
return Qt::Vertical;
}
QskScrollViewSkinlet::QskScrollViewSkinlet( QskSkin* skin )
: Inherited( skin )
{
@ -87,55 +97,45 @@ QSGNode* QskScrollViewSkinlet::updateSubNode(
switch ( nodeRole )
{
case PanelRole:
{
return updateBoxNode( skinnable, node, Q::Panel );
}
case ViewportRole:
{
return updateBoxNode( skinnable, node, Q::Viewport );
}
case HorizontalScrollHandleRole:
{
const auto rect = subControlRect( skinnable,
scrollView->contentsRect(), Q::HorizontalScrollHandle );
QskSkinStateChanger stateChanger( scrollView );
stateChanger.setStates( scrollView->scrollHandleStates( Qt::Horizontal ) );
return updateBoxNode( skinnable, node, rect, Q::HorizontalScrollHandle );
}
return updateScrollBarNode( scrollView, Q::HorizontalScrollHandle, node );
case VerticalScrollHandleRole:
{
const auto rect = subControlRect( skinnable,
scrollView->contentsRect(), Q::VerticalScrollHandle );
QskSkinStateChanger stateChanger( scrollView );
stateChanger.setStates( scrollView->scrollHandleStates( Qt::Vertical ) );
return updateBoxNode( skinnable, node, rect, Q::VerticalScrollHandle );
}
case ContentsRootRole:
{
return updateContentsRootNode( scrollView, node );
}
return updateScrollBarNode( scrollView, Q::VerticalScrollHandle, node );
case HorizontalScrollBarRole:
{
return updateBoxNode( skinnable, node, Q::HorizontalScrollBar );
}
return updateScrollBarNode( scrollView, Q::HorizontalScrollBar, node );
case VerticalScrollBarRole:
{
return updateBoxNode( skinnable, node, Q::VerticalScrollBar );
}
return updateScrollBarNode( scrollView, Q::VerticalScrollBar, node );
case ContentsRootRole:
return updateContentsRootNode( scrollView, node );
}
return Inherited::updateSubNode( skinnable, nodeRole, node );
}
QSGNode* QskScrollViewSkinlet::updateScrollBarNode( const QskScrollView* scrollView,
QskAspect::Subcontrol subControl, QSGNode* node ) const
{
const auto rect = subControlRect( scrollView,
scrollView->contentsRect(), subControl );
const auto orientation = qskSubcontrolOrientation( subControl );
QskSkinStateChanger stateChanger( scrollView );
stateChanger.setStates( scrollView->scrollHandleStates( orientation ) );
return updateBoxNode( scrollView, node, rect, subControl );
}
QSGNode* QskScrollViewSkinlet::updateContentsRootNode(
const QskScrollView* scrollView, QSGNode* node ) const
{

2
src/controls/QskScrollViewSkinlet.h
View File

@ -47,6 +47,8 @@ class QSK_EXPORT QskScrollViewSkinlet : public QskSkinlet
private:
QSGNode* updateContentsRootNode( const QskScrollView*, QSGNode* ) const;
QSGNode* updateScrollBarNode(
const QskScrollView*, QskAspect::Subcontrol, QSGNode* ) const;
QRectF viewportRect( const QskScrollView*, const QRectF& ) const;
QRectF scrollBarRect( const QskScrollView*, const QRectF&, Qt::Orientation ) const;