Compare commits
4 Commits
37cfa927d1
...
b9ffae0269
Author | SHA1 | Date | |
---|---|---|---|
b9ffae0269 | |||
003f3e01c6 | |||
9028e74af0 | |||
f5ccab5f2c |
@@ -14,8 +14,6 @@
|
|||||||
subsheets
|
subsheets
|
||||||
* PaletteEditor: Add RGB key shortcuts for focusing color channels
|
* PaletteEditor: Add RGB key shortcuts for focusing color channels
|
||||||
* PaletteEditor: Add color preview to color editor
|
* PaletteEditor: Add color preview to color editor
|
||||||
* PaletteEditor: Make RGB key shortcuts work when color channel inputs are
|
|
||||||
focused
|
|
||||||
|
|
||||||
# d2025.05.1
|
# d2025.05.1
|
||||||
|
|
||||||
|
@@ -275,7 +275,7 @@ bool bgStatus(Context&, unsigned const bg) noexcept {
|
|||||||
|
|
||||||
void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
|
void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
|
||||||
constexpr auto Bg0Status = 8;
|
constexpr auto Bg0Status = 8;
|
||||||
const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
|
auto const mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
|
||||||
REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
|
REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -194,6 +194,7 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key const key, bool const do
|
|||||||
void TileSheetEditorImGui::draw(studio::Context&) noexcept {
|
void TileSheetEditorImGui::draw(studio::Context&) noexcept {
|
||||||
setCopyEnabled(m_model.hasSelection());
|
setCopyEnabled(m_model.hasSelection());
|
||||||
setCutEnabled(m_model.hasSelection());
|
setCutEnabled(m_model.hasSelection());
|
||||||
|
setPasteEnabled(m_model.hasSelection());
|
||||||
if (ig::mainWinHasFocus() && m_tool == TileSheetTool::Select) {
|
if (ig::mainWinHasFocus() && m_tool == TileSheetTool::Select) {
|
||||||
if (ImGui::IsKeyDown(ImGuiKey_ModCtrl) && !m_palPathFocused) {
|
if (ImGui::IsKeyDown(ImGuiKey_ModCtrl) && !m_palPathFocused) {
|
||||||
if (ImGui::IsKeyPressed(ImGuiKey_A)) {
|
if (ImGui::IsKeyPressed(ImGuiKey_A)) {
|
||||||
|
@@ -635,8 +635,7 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
|
|||||||
keel::DuplicateSet ds;
|
keel::DuplicateSet ds;
|
||||||
OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds));
|
OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds));
|
||||||
if (ds.size()) {
|
if (ds.size()) {
|
||||||
ox::String msg;
|
ox::String msg{"Multiple files have the same UUID:\n"};
|
||||||
msg += "Multiple files have the same UUID:\n";
|
|
||||||
for (auto const &k : ds.keys()) {
|
for (auto const &k : ds.keys()) {
|
||||||
msg += ox::sfmt("\n\t{}:\n", k.toString());
|
msg += ox::sfmt("\n\t{}:\n", k.toString());
|
||||||
for (auto const &v : ds[k]) {
|
for (auto const &v : ds[k]) {
|
||||||
|
Reference in New Issue
Block a user