mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-07-05 12:28:58 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE Hide the join world buttons properly

Browse Source 
This also fixes `QAction::setVisible` not working correctly in other parts of the codebase
This commit is contained in:
arthomnix 2023-04-09 19:18:31 +01:00
parent 1ad3e4417f
commit 5ff03584a5
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/ui/pages/instance/WorldListPage.cpp
View File

@ -320,12 +320,6 @@ void WorldListPage::worldChanged(const QModelIndex &current, const QModelIndex &
bool enable = index.isValid();
ui->actionJoin->setVisible(enableJoinActions);
ui->actionJoinOffline->setVisible(enableJoinActions);
// The above lines will only hide the actions from the right click menu, to hide them from the toolbar we need to do this.
// If any more actions are added above the Join/Join Offline actions, these indices will need to be updated!
ui->toolBar->actions().at(2)->setVisible(enableJoinActions);
ui->toolBar->actions().at(3)->setVisible(enableJoinActions);
// Also disable the separator so there aren't 2 separators in a row
ui->toolBar->actions().at(4)->setVisible(enableJoinActions);
ui->actionJoin->setEnabled(enable && enableJoinActions);
ui->actionJoinOffline->setEnabled(enable && enableJoinActions);
ui->actionCopy_Seed->setEnabled(enable);

5
launcher/ui/pages/instance/WorldListPage.ui
View File

@ -81,9 +81,8 @@
</attribute>
<addaction name="actionAdd"/>
<addaction name="separator"/>
<addaction name="actionJoin" />
<addaction name="actionJoinOffline" />
<addaction name="separator" />
<addaction name="actionJoin"/>
<addaction name="actionJoinOffline"/>
<addaction name="actionRename"/>
<addaction name="actionCopy"/>
<addaction name="actionRemove"/>

4
launcher/ui/widgets/WideBar.cpp
View File

@ -20,7 +20,6 @@ private slots:
setText(m_action->text());
setIcon(m_action->icon());
setToolTip(m_action->toolTip());
setHidden(!m_action->isVisible());
setFocusPolicy(Qt::NoFocus);
}
private:
@ -63,6 +62,9 @@ void WideBar::addAction(QAction* action)
{
auto entry = new BarEntry();
entry->qAction = addWidget(new ActionButton(action, this));
connect(action, &QAction::changed, entry->qAction, [entry, action](){
entry->qAction->setVisible(action->isVisible());
});
entry->wideAction = action;
entry->type = BarEntry::Action;
m_entries.push_back(entry);