Compare commits

..

No commits in common. "b46cb65b7f5b1ea17c115fcb31a6baff323ea1a3" and "5418c06296cba49cbc90feb277cd10ff62d7539d" have entirely different histories.

3 changed files with 3 additions and 13 deletions

View File

@ -109,9 +109,8 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key key, bool down) {
m_subsheetEditor.close(); m_subsheetEditor.close();
m_exportMenu.close(); m_exportMenu.close();
} }
auto const popupOpen = m_subsheetEditor.isOpen() && m_exportMenu.isOpen(); auto pal = m_model.pal();
auto const pal = m_model.pal(); if (pal) {
if (pal && !popupOpen) {
const auto colorCnt = pal->colors.size(); const auto colorCnt = pal->colors.size();
if (key == turbine::Key::Alpha_D) { if (key == turbine::Key::Alpha_D) {
m_tool = Tool::Draw; m_tool = Tool::Draw;
@ -497,7 +496,7 @@ void TileSheetEditorImGui::ExportMenu::draw() noexcept {
ImGui::SetNextWindowSize(ImVec2(235, popupHeight)); ImGui::SetNextWindowSize(ImVec2(235, popupHeight));
if (ImGui::BeginPopupModal(popupName, &m_show, modalFlags)) { if (ImGui::BeginPopupModal(popupName, &m_show, modalFlags)) {
ImGui::InputInt("Scale", &m_scale); ImGui::InputInt("Scale", &m_scale);
m_scale = ox::clamp(m_scale, 1, 50); m_scale = ox::clamp(m_scale, 1, 20);
if (ImGui::Button("OK", ImVec2{50, 20})) { if (ImGui::Button("OK", ImVec2{50, 20})) {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
m_show = false; m_show = false;

View File

@ -41,8 +41,6 @@ class TileSheetEditorImGui: public studio::Editor {
} }
void draw() noexcept; void draw() noexcept;
void close() noexcept; void close() noexcept;
[[nodiscard]]
inline bool isOpen() const noexcept { return m_show; }
}; };
class ExportMenu { class ExportMenu {
int m_scale = 0; int m_scale = 0;
@ -55,8 +53,6 @@ class TileSheetEditorImGui: public studio::Editor {
} }
void draw() noexcept; void draw() noexcept;
void close() noexcept; void close() noexcept;
[[nodiscard]]
inline bool isOpen() const noexcept { return m_show; }
}; };
std::size_t m_selectedPaletteIdx = 0; std::size_t m_selectedPaletteIdx = 0;
turbine::Context &m_ctx; turbine::Context &m_ctx;

View File

@ -9,11 +9,6 @@ target_link_libraries(
OlympicApplib OlympicApplib
) )
target_compile_definitions(
NostalgiaStudio PUBLIC
OLYMPIC_APP_VERSION="dev build"
)
install( install(
TARGETS TARGETS
NostalgiaStudio NostalgiaStudio