atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

do not scroll encounter tabs with wheel, set current species combo by index instead of text

Browse source
This commit is contained in:
garak 2023-01-16 15:45:45 -05:00 committed by t
parent b5444ce803
commit 5c63dc9bbc
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/encountertabledelegates.cpp
View file

@ -35,7 +35,7 @@ QWidget *SpeciesComboDelegate::createEditor(QWidget *parent, const QStyleOptionV
void SpeciesComboDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const { void SpeciesComboDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const {
QString species = index.data(Qt::EditRole).toString(); QString species = index.data(Qt::EditRole).toString();
NoScrollComboBox *combo = static_cast<NoScrollComboBox *>(editor); NoScrollComboBox *combo = static_cast<NoScrollComboBox *>(editor);
combo->setCurrentText(species); combo->setCurrentIndex(combo->findText(species));
} }
void SpeciesComboDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { void SpeciesComboDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const {

6
src/ui/montabwidget.cpp
View file

@ -9,7 +9,7 @@
MonTabWidget::MonTabWidget(Editor *editor, QWidget *parent) : QTabWidget(parent) { MonTabWidget::MonTabWidget(Editor *editor, QWidget *parent) : QTabWidget(parent) {
this->editor = editor; this->editor = editor;
populate(); populate();
installEventFilter(this); this->tabBar()->installEventFilter(this);
} }
bool MonTabWidget::eventFilter(QObject *, QEvent *event) { bool MonTabWidget::eventFilter(QObject *, QEvent *event) {
@ -21,6 +21,10 @@ bool MonTabWidget::eventFilter(QObject *, QEvent *event) {
if (tabIndex > -1) { if (tabIndex > -1) {
askActivateTab(tabIndex, eventPos); askActivateTab(tabIndex, eventPos);
} }
return true;
}
else if (event->type() == QEvent::Wheel) {
return true;
} }
return false; return false;
} }