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

uncrustified

This commit is contained in:
Uwe Rathmann 2022-09-13 12:22:20 +02:00
parent 1900adbabb
commit 7ca1e2f261
12 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/QskHctColor.h
View File

@ -80,8 +80,10 @@ inline constexpr QskHctColor QskHctColor::toned( qreal tone ) const noexcept
} }
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
class QDebug; class QDebug;
QSK_EXPORT QDebug operator<<( QDebug, const QskHctColor& ); QSK_EXPORT QDebug operator<<( QDebug, const QskHctColor& );
#endif #endif
#endif #endif

11
src/controls/QskSliderSkinlet.cpp
View File

@ -236,12 +236,15 @@ QRectF QskSliderSkinlet::handleRect(
QRectF QskSliderSkinlet::rippleRect( QRectF QskSliderSkinlet::rippleRect(
const QskSlider* slider, const QRectF& rect ) const const QskSlider* slider, const QRectF& rect ) const
{ {
const auto rippleSize = slider->strutSizeHint( QskSlider::Ripple );
const auto handleSize = slider->strutSizeHint( QskSlider::Handle );
const auto w = ( rippleSize.width() - handleSize.width() ) / 2;
const auto h = ( rippleSize.height() - handleSize.height() ) / 2;
auto r = handleRect( slider, rect ); auto r = handleRect( slider, rect );
auto rippleSize = slider->strutSizeHint( QskSlider::Ripple );
auto handleSize = slider->strutSizeHint( QskSlider::Handle );
auto w = ( rippleSize.width() - handleSize.width() ) / 2,
h = ( rippleSize.height() - handleSize.height() ) / 2;
r = r.marginsAdded( { w, h, w, h } ); r = r.marginsAdded( { w, h, w, h } );
return r; return r;
} }

2
src/layouts/QskSubcontrolLayoutEngine.cpp
View File

@ -336,7 +336,7 @@ void QskSubcontrolLayoutEngine::setGraphicTextElements( const QskSkinnable* skin
GraphicElement* graphicElement = nullptr; GraphicElement* graphicElement = nullptr;
if ( !graphicSize.isEmpty() && ( graphicSubControl != QskAspect::Control ) ) if ( !graphicSize.isEmpty() && ( graphicSubControl != QskAspect::Control ) )
{ {
graphicElement = dynamic_cast< GraphicElement * >( element( graphicSubControl ) ); graphicElement = dynamic_cast< GraphicElement* >( element( graphicSubControl ) );
if ( graphicElement == nullptr ) if ( graphicElement == nullptr )
{ {
graphicElement = new GraphicElement( skinnable, graphicSubControl ); graphicElement = new GraphicElement( skinnable, graphicSubControl );