Compare commits
2 Commits
master
...
release-d2
Author | SHA1 | Date | |
---|---|---|---|
6d649292e2 | |||
7f56a77e7d |
@ -109,8 +109,9 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key key, bool down) {
|
|||||||
m_subsheetEditor.close();
|
m_subsheetEditor.close();
|
||||||
m_exportMenu.close();
|
m_exportMenu.close();
|
||||||
}
|
}
|
||||||
auto pal = m_model.pal();
|
auto const popupOpen = m_subsheetEditor.isOpen() && m_exportMenu.isOpen();
|
||||||
if (pal) {
|
auto const pal = m_model.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;
|
||||||
@ -496,7 +497,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, 20);
|
m_scale = ox::clamp(m_scale, 1, 50);
|
||||||
if (ImGui::Button("OK", ImVec2{50, 20})) {
|
if (ImGui::Button("OK", ImVec2{50, 20})) {
|
||||||
ImGui::CloseCurrentPopup();
|
ImGui::CloseCurrentPopup();
|
||||||
m_show = false;
|
m_show = false;
|
||||||
|
@ -41,6 +41,8 @@ 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;
|
||||||
@ -53,6 +55,8 @@ 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;
|
||||||
|
@ -9,6 +9,11 @@ target_link_libraries(
|
|||||||
OlympicApplib
|
OlympicApplib
|
||||||
)
|
)
|
||||||
|
|
||||||
|
target_compile_definitions(
|
||||||
|
NostalgiaStudio PUBLIC
|
||||||
|
OLYMPIC_APP_VERSION="2023.12.0"
|
||||||
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
TARGETS
|
TARGETS
|
||||||
NostalgiaStudio
|
NostalgiaStudio
|
||||||
|
Loading…
Reference in New Issue
Block a user