diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/draw.cpp | 5 | ||||
| -rw-r--r-- | editor/imgui.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/editor/draw.cpp b/editor/draw.cpp index 92f0ea47..9f113e71 100644 --- a/editor/draw.cpp +++ b/editor/draw.cpp @@ -152,11 +152,12 @@ clickable* app::find_clickable_scenery(const Optional<Vector2i>& pixel) return nullptr; clickable* item = nullptr; - float depth = -1; + float depth = -(1 << 24); const auto array = M->clickable_scenery(); + const auto p = *pixel; for (clickable& c : array) - if (c.depth > depth && c.dest.contains(*pixel)) + if (c.depth > depth && c.dest.contains(p)) { const auto pos_ = *pixel - c.dest.min() + Vector2i(c.src.min()); const auto pos = !c.mirrored ? pos_ : Vector2i(int(c.src.sizeX()) - 1 - pos_[0], pos_[1]); diff --git a/editor/imgui.cpp b/editor/imgui.cpp index 535f028b..28337bc8 100644 --- a/editor/imgui.cpp +++ b/editor/imgui.cpp @@ -259,7 +259,7 @@ void app::do_popup_menu() fm_assert(type != popup_target_type::none); //if (type != popup_target_type::scenery) {...} if (sc) - ImGui::OpenPopup(SCENERY_POPUP_NAME.data(), ImGuiPopupFlags_NoOpenOverItems); + ImGui::OpenPopup(SCENERY_POPUP_NAME.data()); } if (auto b1 = begin_popup(SCENERY_POPUP_NAME)) |