applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-03 12:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[keyboard] When changing layouts, reset variant

Browse source 
- Need to update the variant that is in use, **and**
  explicitly update it in the widget, in order to re-load
  the keyboard image for the newly-selected layout+variant.
This commit is contained in:
Adriaan de Groot 2020-11-12 15:29:15 +01:00
parent fdfe3937e9
commit 03e09cb7e6
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/keyboard/KeyboardLayoutModel.cpp
View file

@ -269,5 +269,6 @@ KeyboardVariantsModel::setVariants( QMap< QString, QString > variants )
{ {
m_list << ModelInfo { variants[ key ], key }; m_list << ModelInfo { variants[ key ], key };
} }
m_currentIndex = -1;
endResetModel(); endResetModel();
} }

1
src/modules/keyboard/KeyboardPage.cpp
View file

@ -90,6 +90,7 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
connect( config->keyboardLayouts(), &KeyboardLayoutModel::currentIndexChanged, [ this ]( int index ) { connect( config->keyboardLayouts(), &KeyboardLayoutModel::currentIndexChanged, [ this ]( int index ) {
ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) ); ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) );
m_keyboardPreview->setLayout( m_config->keyboardLayouts()->key( index ) ); m_keyboardPreview->setLayout( m_config->keyboardLayouts()->key( index ) );
m_keyboardPreview->setVariant( m_config->keyboardVariants()->key( m_config->keyboardVariants()->currentIndex() ) );
} ); } );
connect( connect(