add shadow to buttons
This commit is contained in:
parent
f53d0daeda
commit
42ab3fcb85
@ -21,6 +21,7 @@
|
|||||||
#include <QskScrollView.h>
|
#include <QskScrollView.h>
|
||||||
#include <QskSegmentedBar.h>
|
#include <QskSegmentedBar.h>
|
||||||
#include <QskSeparator.h>
|
#include <QskSeparator.h>
|
||||||
|
#include <QskShadowMetrics.h>
|
||||||
#include <QskSlider.h>
|
#include <QskSlider.h>
|
||||||
#include <QskSubWindow.h>
|
#include <QskSubWindow.h>
|
||||||
#include <QskSwitchButton.h>
|
#include <QskSwitchButton.h>
|
||||||
@ -446,6 +447,9 @@ void Editor::setupPushButton()
|
|||||||
c2.setAlphaF( 0.38 );
|
c2.setAlphaF( 0.38 );
|
||||||
setColor( Q::Text | Q::Disabled, c2 );
|
setColor( Q::Text | Q::Disabled, c2 );
|
||||||
|
|
||||||
|
QskShadowMetrics shadow( -1, 5 );
|
||||||
|
setShadowMetrics( Q::Panel | Q::Hovered, shadow );
|
||||||
|
setShadowColor( Q::Panel | Q::Hovered, m_pal.shadow );
|
||||||
|
|
||||||
// Outlined and Text:
|
// Outlined and Text:
|
||||||
|
|
||||||
@ -872,6 +876,8 @@ QskMaterialTheme::QskMaterialTheme( Lightness lightness,
|
|||||||
surfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W90 );
|
surfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W90 );
|
||||||
onSurfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W30 );
|
onSurfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W30 );
|
||||||
outline = m_palettes[ NeutralVariant ].rgb( Q::W50 );
|
outline = m_palettes[ NeutralVariant ].rgb( Q::W50 );
|
||||||
|
|
||||||
|
shadow = m_palettes[ Neutral ].rgb( Q::W0 );
|
||||||
}
|
}
|
||||||
else if ( lightness == Dark )
|
else if ( lightness == Dark )
|
||||||
{
|
{
|
||||||
@ -903,6 +909,8 @@ QskMaterialTheme::QskMaterialTheme( Lightness lightness,
|
|||||||
surfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W30 );
|
surfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W30 );
|
||||||
onSurfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W80 );
|
onSurfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W80 );
|
||||||
outline = m_palettes[ NeutralVariant ].rgb( Q::W60 );
|
outline = m_palettes[ NeutralVariant ].rgb( Q::W60 );
|
||||||
|
|
||||||
|
shadow = m_palettes[ Neutral ].rgb( Q::W0 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,6 +63,8 @@ class QSK_MATERIAL_EXPORT QskMaterialTheme
|
|||||||
QRgb onSurfaceVariant;
|
QRgb onSurfaceVariant;
|
||||||
QRgb outline;
|
QRgb outline;
|
||||||
|
|
||||||
|
QRgb shadow;
|
||||||
|
|
||||||
const qreal hoverOpacity = 0.08;
|
const qreal hoverOpacity = 0.08;
|
||||||
const qreal focusOpacity = 0.12;
|
const qreal focusOpacity = 0.12;
|
||||||
const qreal pressedOpacity = 0.12;
|
const qreal pressedOpacity = 0.12;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user