Skip to content
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

Jump to bottom

Improve FleetWnd split fleet #863

Merged
merged 19 commits into from Aug 15, 2016
Merged

Improve FleetWnd split fleet #863

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
efa00c3
Add ScopedTimer to split fleet.
LGM-Doyle Aug 6, 2016
7f4b0f1
Add num_refresh_fleet_button/num_rendering tracking to MapWnd.cpp.
LGM-Doyle Aug 8, 2016
536f3c3
Add ScopedTimers in RefreshFleetButtons.
LGM-Doyle Aug 9, 2016
2a52cac
Add DeferredRefreshFleetButtons() to do work once per Render() cycle.
LGM-Doyle Aug 9, 2016
76f8f38
In DeferredRefreshFleetButton() call SetFleetMovementLine per fleet.
LGM-Doyle Aug 9, 2016
655fdfa
Remove unused SetFleetMovementLine(per fleet button).
LGM-Doyle Aug 14, 2016
c71b9b1
Split MapWnd::FleetsAddedOrRemoved() into Inserted and Removed handlers.
LGM-Doyle Aug 9, 2016
49b7242
Add boost::hash<TemporaryPtr<T> >.
LGM-Doyle Aug 12, 2016
f11715b
In MapWnd change m_system_icons from std::map to unordered_map.
LGM-Doyle Aug 12, 2016
86cf41a
Refactor creation of sets of fleets in RefreshFleetButtons.
LGM-Doyle Aug 12, 2016
95c920d
Add test code to verify sets of fleets in RefreshFleetButtons.
LGM-Doyle Aug 12, 2016
5734a6a
Remove test code to verify sets of fleets in RefreshFleetButtons.
LGM-Doyle Aug 13, 2016
01f217e
Add MapWnd::CreateFleetButtonsOfType().
LGM-Doyle Aug 13, 2016
409ec98
In MapWnd.cpp remove old fleet button code.
LGM-Doyle Aug 13, 2016
440ec57
Create MapWnd::DeleteFleetButtons() to reduce duplicated code.
LGM-Doyle Aug 13, 2016
de7c2d7
Change MapWnd::m_x_fleet_buttons to unordered_map.
LGM-Doyle Aug 13, 2016
8fa99b6
Remove num_update/num_render reporting.
LGM-Doyle Aug 14, 2016
02c5b3a
Remove extra ScopedTimers from DeferredRefreshFleetButtons.
LGM-Doyle Aug 14, 2016
9c8dfe7
Changes for PR #863 reivew.
LGM-Doyle Aug 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions UI/FleetWnd.cpp
View file
Open in desktop
Expand Up @@ -3491,6 +3491,7 @@ void FleetWnd::FleetRightClicked(GG::ListBox::iterator it, const GG::Pt& pt, con
}

case 4: { // split
ScopedTimer split_fleet_timer("FleetWnd::SplitFleet", true);
// remove first ship from set, so it stays in its existing fleet
std::set<int>::iterator it = ship_ids_set.begin();
ship_ids_set.erase(it);
Expand Down