gcc issues fixed
This commit is contained in:
parent
8b2e39caae
commit
d06c2c6d8f
@ -7,7 +7,6 @@
|
|||||||
#include <QskLinearBox.h>
|
#include <QskLinearBox.h>
|
||||||
#include <QskGridBox.h>
|
#include <QskGridBox.h>
|
||||||
#include <QskTextInput.h>
|
#include <QskTextInput.h>
|
||||||
#include <QRegExpValidator>
|
|
||||||
#include <QskBoxShapeMetrics.h>
|
#include <QskBoxShapeMetrics.h>
|
||||||
#include <QskBoxBorderColors.h>
|
#include <QskBoxBorderColors.h>
|
||||||
#include <QskBoxBorderMetrics.h>
|
#include <QskBoxBorderMetrics.h>
|
||||||
@ -17,7 +16,6 @@
|
|||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include <QStyleHints>
|
#include <QStyleHints>
|
||||||
#include <QskIntervalF.h>
|
#include <QskIntervalF.h>
|
||||||
#include <array>
|
|
||||||
|
|
||||||
QSK_SUBCONTROL(QskSpinBox, Inc)
|
QSK_SUBCONTROL(QskSpinBox, Inc)
|
||||||
QSK_SUBCONTROL(QskSpinBox, Dec)
|
QSK_SUBCONTROL(QskSpinBox, Dec)
|
||||||
@ -193,7 +191,7 @@ void QskSpinBox::hoverEnterEvent(QHoverEvent* event)
|
|||||||
m_data->saveMousePosition( qskHoverPosition( event ) );
|
m_data->saveMousePosition( qskHoverPosition( event ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
void QskSpinBox::hoverLeaveEvent(QHoverEvent* event)
|
void QskSpinBox::hoverLeaveEvent(QHoverEvent* )
|
||||||
{
|
{
|
||||||
m_data->saveMousePosition( {} );
|
m_data->saveMousePosition( {} );
|
||||||
}
|
}
|
||||||
|
@ -173,8 +173,6 @@ QRectF QskSpinBoxSkinlet::subControlRect(const QskSkinnable* const skinnable, co
|
|||||||
}
|
}
|
||||||
else if(layout == (Qt::AlignBottom | Qt::AlignHCenter))
|
else if(layout == (Qt::AlignBottom | Qt::AlignHCenter))
|
||||||
{
|
{
|
||||||
const auto dx = qMax(rects[Inc].width(), rects[Dec].width());
|
|
||||||
const auto dy = qMax(rects[Inc].height(), rects[Dec].height());
|
|
||||||
rects[Txt].moveTopLeft({center.x() - rects[Txt].width() * 0.5, center.y() - rects[Txt].height() * 0.5});
|
rects[Txt].moveTopLeft({center.x() - rects[Txt].width() * 0.5, center.y() - rects[Txt].height() * 0.5});
|
||||||
rects[Dec].moveTopLeft({center.x() - spacing * 0.5 - rects[Dec].width() , rects[Txt].top() - spacing - rects[Dec].height() });
|
rects[Dec].moveTopLeft({center.x() - spacing * 0.5 - rects[Dec].width() , rects[Txt].top() - spacing - rects[Dec].height() });
|
||||||
rects[Inc].moveTopLeft({center.x() + spacing * 0.5, rects[Txt].top() - spacing - rects[Inc].height() });
|
rects[Inc].moveTopLeft({center.x() + spacing * 0.5, rects[Txt].top() - spacing - rects[Inc].height() });
|
||||||
|
Loading…
x
Reference in New Issue
Block a user