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

Material 3: Style virtual keyboard

This commit is contained in:
Peter Hartmann 2023-02-25 09:10:59 +01:00 committed by uwerat
parent 45df0a8807
commit 6d329e1e39
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
skins/material3/QskMaterial3Skin.cpp
View File

@ -1151,11 +1151,9 @@ void Editor::setupVirtualKeyboard()
using Q = QskVirtualKeyboard; using Q = QskVirtualKeyboard;
// key panel // key panel
setMargin( Q::ButtonPanel, 2_dp ); setMargin( Q::ButtonPanel, 5_dp );
setGradient( Q::ButtonPanel, m_pal.background );
setBoxShape( Q::ButtonPanel, 20.0, Qt::RelativeSize ); setBoxShape( Q::ButtonPanel, 6_dp );
setBoxBorderMetrics( Q::ButtonPanel, 2_dp );
setBoxBorderColors( Q::ButtonPanel, m_pal.background );
for ( auto state : { A::NoState, Q::Focused } ) for ( auto state : { A::NoState, Q::Focused } )
setBoxBorderColors( Q::ButtonPanel | QskPushButton::Pressed | state, setBoxBorderColors( Q::ButtonPanel | QskPushButton::Pressed | state,
@ -1164,11 +1162,12 @@ void Editor::setupVirtualKeyboard()
setAnimation( Q::ButtonPanel | A::Color, qskDuration ); setAnimation( Q::ButtonPanel | A::Color, qskDuration );
setAnimation( Q::ButtonPanel | A::Metric, qskDuration ); setAnimation( Q::ButtonPanel | A::Metric, qskDuration );
setColor( Q::ButtonText, m_pal.onBackground );
setFontRole( Q::ButtonText, QskMaterial3Skin::M3HeadlineSmall );
// panel // panel
setBoxShape( Q::Panel, 0 ); setGradient( Q::Panel, m_pal.surfaceVariant );
setBoxBorderMetrics( Q::Panel, 0 ); setPadding( Q::Panel, { 3_dp, 25_dp, 3_dp, 5_dp } );
setGradient( Q::Panel, m_pal.secondaryContainer );
setBoxBorderColors( Q::Panel, m_pal.background );
} }
void Editor::setupScrollView() void Editor::setupScrollView()

1
src/inputpanel/QskInputPanelBox.cpp
View File

@ -93,6 +93,7 @@ QskInputPanelBox::QskInputPanelBox( QQuickItem* parent )
auto layout = new QskLinearBox( Qt::Vertical, this ); auto layout = new QskLinearBox( Qt::Vertical, this );
layout->setDefaultAlignment( Qt::AlignLeft | Qt::AlignHCenter ); layout->setDefaultAlignment( Qt::AlignLeft | Qt::AlignHCenter );
layout->setSpacing( 0 );
layout->addItem( m_data->prompt ); layout->addItem( m_data->prompt );
layout->addItem( m_data->inputProxy ); layout->addItem( m_data->inputProxy );

11
src/inputpanel/QskVirtualKeyboard.cpp
View File

@ -29,9 +29,11 @@ namespace
, m_row( row ) , m_row( row )
, m_column( column ) , m_column( column )
{ {
#if 0
QskTextOptions options; QskTextOptions options;
options.setFontSizeMode( QskTextOptions::VerticalFit ); options.setFontSizeMode( QskTextOptions::VerticalFit );
setTextOptions( options ); setTextOptions( options );
#endif
setFocusPolicy( Qt::TabFocus ); setFocusPolicy( Qt::TabFocus );
} }
@ -278,15 +280,6 @@ QskAspect::Subcontrol QskVirtualKeyboard::substitutedSubcontrol(
if ( subControl == QskBox::Panel ) if ( subControl == QskBox::Panel )
return QskVirtualKeyboard::Panel; return QskVirtualKeyboard::Panel;
#if 1
// TODO ...
if ( subControl == QskVirtualKeyboard::ButtonPanel )
return QskPushButton::Panel;
if ( subControl == QskVirtualKeyboard::ButtonText )
return QskPushButton::Text;
#endif
return Inherited::substitutedSubcontrol( subControl ); return Inherited::substitutedSubcontrol( subControl );
} }