drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[nostalgia] Update for compatibility with Ox changes

Browse Source
This commit is contained in:
Gary Talent
2022-02-12 14:32:10 -06:00
parent 610dc2ceca
commit 34221f086c
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/core/studio/tilesheeteditor.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ void TileSheetEditor::draw(core::Context*) noexcept {
const auto wheel = io.MouseWheel;
const auto wheelh = io.MouseWheelH;
if (wheel != 0) {
const auto zoomMod = ox::defines::OS == ox::defines::OS::Darwin ? io.KeySuper : io.KeyCtrl;
const auto zoomMod = ox::defines::OS == ox::OS::Darwin ? io.KeySuper : io.KeyCtrl;
const auto pixelSize = m_pixelsDrawer.pixelSize(paneSize);
const ImVec2 sheetSize(pixelSize.x * static_cast<float>(m_img.columns) * TileWidth,
pixelSize.y * static_cast<float>(m_img.rows) * TileHeight);
src/nostalgia/core/studio/tilesheeteditor.hpp
+1 -1
View File
@@ -86,7 +86,7 @@ struct TileSheetClipboard {
};
template<typename T>
ox::Error model(T *io, TileSheetClipboard *b) {
constexpr ox::Error model(T *io, TileSheetClipboard *b) noexcept {
io->template setTypeInfo<TileSheetClipboard>();
oxReturnError(io->field("pixels", &b->m_pixels));
oxReturnError(io->field("p1", &b->m_p1));