feedc0de/QtGameMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add BeginStep and EndStep events

Browse Source
This commit is contained in:
0xFEEDC0DE64
2024-01-02 21:46:05 +01:00
parent 59d591267e
commit f94bdf2113
3 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/editor/dialogs/addeventdialog.cpp
View File

@@ -29,8 +29,6 @@ AddEventDialog::AddEventDialog(ProjectTreeModel &projectModel, QWidget *parent)
this, [this](){ m_eventType = Object::EventType::Destroy; accept(); }); this, [this](){ m_eventType = Object::EventType::Destroy; accept(); });
connect(m_ui->pushButtonDraw, &QAbstractButton::clicked, connect(m_ui->pushButtonDraw, &QAbstractButton::clicked,
this, [this](){ m_eventType = Object::EventType::Draw; accept(); }); this, [this](){ m_eventType = Object::EventType::Draw; accept(); });
connect(m_ui->pushButtonStep, &QAbstractButton::clicked,
this, [this](){ m_eventType = Object::EventType::Step; accept(); });
{ {
auto menu = new QMenu; auto menu = new QMenu;
@@ -49,6 +47,14 @@ AddEventDialog::AddEventDialog(ProjectTreeModel &projectModel, QWidget *parent)
m_ui->pushButtonAlarm->setMenu(menu); m_ui->pushButtonAlarm->setMenu(menu);
} }
{
auto menu = new QMenu;
menu->addAction(tr("Step"), this, [this](){ m_eventType = Object::EventType::Step; accept(); });
menu->addAction(tr("Begin Step"), this, [this](){ m_eventType = Object::EventType::BeginStep; accept(); });
menu->addAction(tr("End Step"), this, [this](){ m_eventType = Object::EventType::EndStep; accept(); });
m_ui->pushButtonStep->setMenu(menu);
}
{ {
auto menu = new QMenu; auto menu = new QMenu;
connect(menu, &QMenu::aboutToShow, menu, [this,menu](){ connect(menu, &QMenu::aboutToShow, menu, [this,menu](){

6
src/editor/models/objecteventsmodel.cpp
View File

@@ -53,6 +53,8 @@ QVariant ObjectEventsModel::data(const QModelIndex &index, int role) const
case Object::EventType::Alarm10: return tr("Alarm 10"); case Object::EventType::Alarm10: return tr("Alarm 10");
case Object::EventType::Alarm11: return tr("Alarm 11"); case Object::EventType::Alarm11: return tr("Alarm 11");
case Object::EventType::Step: return tr("Step"); case Object::EventType::Step: return tr("Step");
case Object::EventType::BeginStep: return tr("Begin Step");
case Object::EventType::EndStep: return tr("End Step");
case Object::EventType::Draw: return tr("Draw"); case Object::EventType::Draw: return tr("Draw");
} }
@@ -75,7 +77,9 @@ QVariant ObjectEventsModel::data(const QModelIndex &index, int role) const
case Object::EventType::Alarm9: case Object::EventType::Alarm9:
case Object::EventType::Alarm10: case Object::EventType::Alarm10:
case Object::EventType::Alarm11: return QIcon{":/qtgameengine/icons/event-alarm.png"}; case Object::EventType::Alarm11: return QIcon{":/qtgameengine/icons/event-alarm.png"};
case Object::EventType::Step: return QIcon{":/qtgameengine/icons/event-step.png"}; case Object::EventType::Step:
case Object::EventType::BeginStep:
case Object::EventType::EndStep: return QIcon{":/qtgameengine/icons/event-step.png"};
case Object::EventType::Draw: return QIcon{":/qtgameengine/icons/event-draw.png"}; case Object::EventType::Draw: return QIcon{":/qtgameengine/icons/event-draw.png"};
} }

2
src/projectcontainer.h
View File

@@ -126,6 +126,8 @@ struct Object
Alarm10, Alarm10,
Alarm11, Alarm11,
Step, Step,
BeginStep,
EndStep,
Draw, Draw,
}; };