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

spin box hovering

Browse Source
This commit is contained in:
Uwe Rathmann 2024-10-21 14:22:09 +02:00
parent b7c2b27691
commit 932d34aea8
3 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/controls/QskSpinBox.cpp
View File

@ -139,6 +139,8 @@ QskSpinBox::QskSpinBox( qreal min, qreal max, qreal stepSize, QQuickItem* parent
setBoundaries( min, max );
setStepSize( stepSize );
setAcceptHoverEvents( true );
setAcceptedMouseButtons( Qt::LeftButton );
setFocusPolicy( Qt::StrongFocus );
@ -302,6 +304,12 @@ void QskSpinBox::mouseUngrabEvent()
m_data->setAutoRepeat( this, 0.0 );
}
void QskSpinBox::hoverMoveEvent( QHoverEvent* event )
{
Inherited::hoverMoveEvent( event );
update(); // enter/leaving a subcontrol
}
void QskSpinBox::keyPressEvent( QKeyEvent* event )
{
if ( !isReadOnly() && !m_data->repeatTimer.isActive() )

2
src/controls/QskSpinBox.h
View File

@ -75,6 +75,8 @@ class QSK_EXPORT QskSpinBox : public QskBoundedValueInput
void mousePressEvent( QMouseEvent* ) override;
void mouseUngrabEvent() override;
void hoverMoveEvent( QHoverEvent* ) override;
void keyPressEvent( QKeyEvent* ) override;
void keyReleaseEvent( QKeyEvent* ) override;

33
src/controls/QskSpinBoxSkinlet.cpp
View File

@ -9,6 +9,27 @@
#include "QskSkinStateChanger.h"
#include <qfontmetrics.h>
#include <qcursor.h>
static bool qskIsButtonHovered(
const QskSpinBox* spinBox, QskAspect::Subcontrol subControl )
{
if ( spinBox->hasSkinState( QskControl::Hovered ) )
{
// disable Hovered to avoid recursive calls
QskSkinStateChanger stateChanger( spinBox );
stateChanger.setStates( spinBox->skinStates() & ~QskControl::Hovered );
const auto r = spinBox->subControlRect( subControl );
if ( !r.isEmpty() )
{
const auto pos = spinBox->mapFromGlobal( QCursor::pos() );
return r.contains( pos );
}
}
return false;
}
static inline QskAspect::States qskButtonStates(
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl )
@ -19,17 +40,23 @@ static inline QskAspect::States qskButtonStates(
auto states = spinBox->skinStates();
if ( spinBox->isEnabled() && !spinBox->isWrapping() )
if ( spinBox->isEnabled() )
{
if ( subControl == Q::DownIndicator || subControl == Q::DownPanel )
{
if ( spinBox->value() <= spinBox->minimum() )
if ( !spinBox->isWrapping() && spinBox->value() <= spinBox->minimum() )
states |= QskControl::Disabled;
if ( !qskIsButtonHovered( spinBox, Q::DownPanel ) )
states &= ~Q::Hovered;
}
else if ( subControl == Q::UpIndicator || subControl == Q::UpPanel )
{
if ( spinBox->value() >= spinBox->maximum() )
if ( !spinBox->isWrapping() && spinBox->value() >= spinBox->maximum() )
states |= QskControl::Disabled;
if ( !qskIsButtonHovered( spinBox, Q::UpPanel ) )
states &= ~Q::Hovered;
}
}