Skip to content

MapEditorController: Disable button to select map parts #2416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −18
Open

MapEditorController: Disable button to select map parts #2416

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions src/gui/map/map_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,26 +1466,30 @@ void MapEditorController::createMobileGUI()
connect(show_top_bar_action, &QAction::triggered, this, &MapEditorController::showTopActionBar);

QAction* mappart_action = new QAction(QIcon(QString::fromLatin1(":/images/map-parts.png")), tr("Map parts"), this);
auto* mappart_group = new QActionGroup(window);
auto* mappart_menu = new QMenu(window);
mappart_action->setMenu(mappart_menu);

// Don't use QMenu::aboutToShow because it causes menu mispositioning near
// lower screen border when triggered from QToolButton.
connect(mappart_action, &QAction::hovered, this, [this, mappart_menu, mappart_group]() {
mappart_menu->clear();
Q_ASSERT(mappart_group->actions().isEmpty());
for (auto i = 0; i < map->getNumParts(); ++i)
{
auto* part = map->getPart(i);
auto* action = mappart_menu->addAction(part->getName());
action->setCheckable(true);
action->setActionGroup(mappart_group);
if (part == map->getCurrentPart())
action->setChecked(true);
connect(action, &QAction::triggered, this, [this, i]() { changeMapPart(i); });
}
});
if (map->getNumParts() > 1)
{
auto* mappart_group = new QActionGroup(window);
// Don't use QMenu::aboutToShow because it causes menu mispositioning near
// lower screen border when triggered from QToolButton.
connect(mappart_action, &QAction::hovered, this, [this, mappart_menu, mappart_group]() {
mappart_menu->clear();
Q_ASSERT(mappart_group->actions().isEmpty());
for (auto i = 0; i < map->getNumParts(); ++i)
{
auto* part = map->getPart(i);
auto* action = mappart_menu->addAction(part->getName());
action->setCheckable(true);
action->setActionGroup(mappart_group);
if (part == map->getCurrentPart())
action->setChecked(true);
connect(action, &QAction::triggered, this, [this, i]() { changeMapPart(i); });
}
});
}
else
mappart_action->setEnabled(false);

// Create button for showing the top bar again after hiding it
const auto button_size_px = qRound(Util::mmToPixelPhysical(Settings::getInstance().getSetting(Settings::ActionGridBar_ButtonSizeMM).toReal()));
Expand Down