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

Merge branch 'master' into features/drawer

This commit is contained in:
Uwe Rathmann 2023-10-18 15:12:46 +02:00
parent 22373861e5 4cbd0d62a5
commit d5619d449e
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skins/fluent2/QskFluent2Skin.cpp
View File

@ -745,8 +745,8 @@ void Editor::setupMenuMetrics()
setPadding( Q::Icon, { 8, 8, 0, 8 } ); setPadding( Q::Icon, { 8, 8, 0, 8 } );
#if 1 #if 1
setPosition( Q::Panel, 0 ); setPosition( Q::Panel, 1 );
setPosition( Q::Panel | QskPopup::Closed, 1 ); setPosition( Q::Panel | QskPopup::Closed, 0 );
// copied from Mat3 - what are the correct values for Fluent2 ??? // copied from Mat3 - what are the correct values for Fluent2 ???
setAnimation( Q::Panel | A::Metric, 150 ); setAnimation( Q::Panel | A::Metric, 150 );

4
skins/material3/QskMaterial3Skin.cpp
View File

@ -378,8 +378,8 @@ void Editor::setupMenu()
setColor( Q::Text, m_pal.onSurface ); setColor( Q::Text, m_pal.onSurface );
setFontRole( Q::Text, QskMaterial3Skin::M3BodyMedium ); setFontRole( Q::Text, QskMaterial3Skin::M3BodyMedium );
setPosition( Q::Panel, 0 ); setPosition( Q::Panel, 1 );
setPosition( Q::Panel | QskPopup::Closed, 1 ); setPosition( Q::Panel | QskPopup::Closed, 0 );
setAnimation( Q::Panel | A::Metric, 150 ); setAnimation( Q::Panel | A::Metric, 150 );
setAnimation( Q::Cursor | A::Position | A::Metric, 75, QEasingCurve::OutCubic ); setAnimation( Q::Cursor | A::Position | A::Metric, 75, QEasingCurve::OutCubic );

4
skins/squiek/QskSquiekSkin.cpp
View File

@ -446,8 +446,8 @@ void Editor::setupMenu()
setGraphicRole( Q::Icon | Q::Disabled, DisabledSymbol ); setGraphicRole( Q::Icon | Q::Disabled, DisabledSymbol );
setGraphicRole( Q::Icon | Q::Selected, CursorSymbol ); setGraphicRole( Q::Icon | Q::Selected, CursorSymbol );
setPosition( Q::Panel, 0 ); setPosition( Q::Panel, 1 );
setPosition( Q::Panel | QskPopup::Closed, 1 ); setPosition( Q::Panel | QskPopup::Closed, 0 );
setAnimation( Q::Panel | A::Metric, 150 ); setAnimation( Q::Panel | A::Metric, 150 );
setAnimation( Q::Cursor | A::Position | A::Metric, 75, QEasingCurve::OutCubic ); setAnimation( Q::Cursor | A::Position | A::Metric, 75, QEasingCurve::OutCubic );

11
src/controls/QskDrawer.cpp
View File

@ -108,6 +108,8 @@ static inline QRectF qskSlidingRect(
auto x = 0.0; auto x = 0.0;
auto y = 0.0; auto y = 0.0;
ratio = 1.0 - ratio;
switch( edge ) switch( edge )
{ {
case Qt::LeftEdge: case Qt::LeftEdge:
@ -437,7 +439,7 @@ QRectF QskDrawer::layoutRectForSize( const QSizeF& size ) const
if ( isFading() ) if ( isFading() )
ratio = metric( faderAspect() ); ratio = metric( faderAspect() );
else else
ratio = isOpen() ? 0.0 : 1.0; ratio = isOpen() ? 1.0 : 0.0;
return qskSlidingRect( size, m_data->edge, ratio ); return qskSlidingRect( size, m_data->edge, ratio );
} }
@ -467,8 +469,11 @@ void QskDrawer::itemChange( QQuickItem::ItemChange change,
void QskDrawer::setFading( bool on ) void QskDrawer::setFading( bool on )
{ {
const qreal from = on ? 1.0 : 0.0; if ( !hasFaderEffect() )
const qreal to = on ? 0.0 : 1.0; return;
const qreal from = on ? 0.0 : 1.0;
const qreal to = on ? 1.0 : 0.0;
const auto aspect = faderAspect(); const auto aspect = faderAspect();

4
src/nodes/QskSlideInNode.cpp
View File

@ -59,7 +59,7 @@ void QskSlideInNode::updateTranslation( const QRectF& rect,
{ {
// clipping // clipping
if ( progress > 0.0 && progress <= 1.0 ) if ( progress >= 0.0 && progress < 1.0 )
{ {
if ( d->clipNode == nullptr ) if ( d->clipNode == nullptr )
{ {
@ -85,7 +85,7 @@ void QskSlideInNode::updateTranslation( const QRectF& rect,
// translation // translation
qreal dx = 0.0; qreal dx = 0.0;
qreal dy = -progress* rect.height(); qreal dy = ( progress - 1.0 ) * rect.height();
if ( dx != 0.0 || dy != 0.0 ) if ( dx != 0.0 || dy != 0.0 )
{ {