1
0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-08 14:25:05 +00:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Thomas Harte
1f7f9884f5 Experiment with a fullscreen toggle. 2022-07-06 08:21:51 -04:00
Thomas Harte
2bee9b3d56 This is a struct, not a class. 2022-07-06 08:21:26 -04:00
Thomas Harte
18735ee571 Merge pull request #1060 from TomHarte/QtErrors
Resolve invalid use of `constexpr` in IPF.cpp.
2022-07-05 17:09:05 -04:00
Thomas Harte
1ce07e2ee8 This reads the file, so it can't be constexpr. 2022-07-05 17:01:38 -04:00
3 changed files with 19 additions and 7 deletions

View File

@@ -595,10 +595,10 @@ Instruction Decoder<model, validate_reserved_bits>::decode(uint32_t opcode) {
return Instruction(opcode);
}
template class InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC601, true>;
template class InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC603, true>;
template class InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC620, true>;
template struct InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC601, true>;
template struct InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC603, true>;
template struct InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC620, true>;
template class InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC601, false>;
template class InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC603, false>;
template class InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC620, false>;
template struct InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC601, false>;
template struct InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC603, false>;
template struct InstructionSet::PowerPC::Decoder<InstructionSet::PowerPC::Model::MPC620, false>;

View File

@@ -478,6 +478,18 @@ void MainWindow::addDisplayMenu(const std::string &machinePrefix, const std::str
QAction *sVideoAction = nullptr;
QAction *rgbAction = nullptr;
// Add the fullscreen toggle.
QAction *const fullscreenToggleAction = new QAction(tr("Toggle fullscreen"));
fullscreenToggleAction->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_F));
displayMenu->addAction(fullscreenToggleAction);
connect(fullscreenToggleAction, &QAction::triggered, this, [=] {
if(window()->isFullScreen()) {
window()->showNormal();
} else {
window()->showFullScreen();
}
});
// Add all requested actions.
#define Add(name, action) \
if(!name.empty()) { \

View File

@@ -25,7 +25,7 @@ constexpr uint32_t block(const char (& src)[5]) {
);
}
constexpr size_t block_size(Storage::FileHolder &file, uint8_t header) {
size_t block_size(Storage::FileHolder &file, uint8_t header) {
uint8_t size_width = header >> 5;
size_t length = 0;
while(size_width--) {