Skip to content

Minor UI bugfixes #2294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schombert merged 2 commits into from
Aug 13, 2026
Merged

Minor UI bugfixes #2294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
446560e
fix a few UI bugs with on-map interactive elements
ineveraskedforthis Aug 13, 2026
7ee187f
Merge branch 'schombert:main' into main
ineveraskedforthis Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/gui/gui_map_icons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,9 @@ class unit_counter_window : public window_element_base {
if(!prov) {
continue;
}
if(army.get_navy_from_army_transport()) {
continue;
}
if(render_count[prov.index()] == render_global_count) {
continue;
}
Expand Down Expand Up @@ -1072,6 +1075,9 @@ class unit_counter_window : public window_element_base {
if(!prov) {
continue;
}
if(army.get_navy_from_army_transport()) {
continue;
}
if(render_count[prov.index()] == render_global_count) {
continue;
}
Expand Down Expand Up @@ -1260,6 +1266,9 @@ class unit_counter_window : public window_element_base {
if(!prov) {
continue;
}
if(army.get_navy_from_army_transport()) {
continue;
}
if(probe_specific_province(state, prov, mx, my, type)) {
probe_result.under_mouse = this;
return probe_result;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/gui_units.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ message_result grid_box::get(sys::state& state, Cyto::Any& payload) noexcept {

void grid_box::open(sys::state& state, ui::xy_pair location, ui::xy_pair source_size, dcon::province_id p, bool port) {
if(!as_port) {
if(p.index() < state.province_definitions.first_sea_province.index()) {
if(p.index() < state.province_definitions.first_sea_province.index() && !port) {
auto pname = text::produce_simple_string(state, state.world.province_get_name(p));
auto arange = state.world.province_get_army_location(p);
if(int32_t(arange.end() - arange.begin()) <= 1)
Expand Down
Loading