Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-12 20:05:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split out NoScroll classes from unrelated behavior

Browse Source
This commit is contained in:
GriffinR
2025-12-30 21:07:29 -05:00
parent 6a982402d9
commit d831af32a7
57 changed files with 433 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainwindow.cpp
View File

@@ -385,7 +385,7 @@ void MainWindow::initExtraSignals() {
connect(ui->action_NewMap, &QAction::triggered, this, &MainWindow::openNewMapDialog);
connect(ui->action_NewLayout, &QAction::triggered, this, &MainWindow::openNewLayoutDialog);
connect(ui->comboBox_LayoutSelector, &NoScrollComboBox::editingFinished, this, &MainWindow::onLayoutSelectorEditingFinished);
connect(ui->comboBox_LayoutSelector, &ComboBox::editingFinished, this, &MainWindow::onLayoutSelectorEditingFinished);
connect(ui->checkBox_smartPaths, &QCheckBox::toggled, this, &MainWindow::setSmartPathsEnabled);
connect(ui->checkBox_ToggleBorder, &QCheckBox::toggled, this, &MainWindow::setBorderVisibility);
connect(ui->checkBox_MirrorConnections, &QCheckBox::toggled, this, &MainWindow::setMirrorConnectionsEnabled);
@@ -502,9 +502,9 @@ void MainWindow::initMiscHeapObjects() {
void MainWindow::initMapList() {
ui->mapListContainer->setCurrentIndex(porymapConfig.mapListTab);
WheelFilter *wheelFilter = new WheelFilter(this);
ui->mainTabBar->installEventFilter(wheelFilter);
ui->mapListContainer->tabBar()->installEventFilter(wheelFilter);
auto noScrollFilter = new NoScrollFilter(this, false);
ui->mainTabBar->installEventFilter(noScrollFilter);
ui->mapListContainer->tabBar()->installEventFilter(noScrollFilter);
// Create buttons for adding and removing items from the mapList
QFrame *buttonFrame = new QFrame(this->ui->mapListContainer);
@@ -1455,13 +1455,13 @@ bool MainWindow::setProjectUI() {
ui->comboBox_DiveMap->clear();
ui->comboBox_DiveMap->addItems(project->mapNames());
ui->comboBox_DiveMap->setClearButtonEnabled(true);
ui->comboBox_DiveMap->setFocusedScrollingEnabled(false);
ui->comboBox_DiveMap->setAllowScrollingIfFocused(false);
const QSignalBlocker b_EmergeMap(ui->comboBox_EmergeMap);
ui->comboBox_EmergeMap->clear();
ui->comboBox_EmergeMap->addItems(project->mapNames());
ui->comboBox_EmergeMap->setClearButtonEnabled(true);
ui->comboBox_EmergeMap->setFocusedScrollingEnabled(false);
ui->comboBox_EmergeMap->setAllowScrollingIfFocused(false);
// Show/hide parts of the UI that are dependent on the user's project settings