mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-13 06:58:03 -05:00
Code Issues Projects Releases Wiki Activity

fix double scrollbar issue

Browse Source
This commit is contained in:
briaguya 2022-08-19 04:53:35 -04:00
parent 11a8dc85ee
commit 7f62d00200
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -3751,7 +3751,7 @@ void DrawRandoEditor(bool& open) {
static ImGuiTextFilter locationSearch; static ImGuiTextFilter locationSearch;
locationSearch.Draw(); locationSearch.Draw();
ImGui::BeginChild("ChildRandomizedLocations"); ImGui::BeginChild("ChildRandomizedLocations", ImVec2(0, -8));
for (auto areaIt : RandomizerCheckObjects::GetAllRCAreas()) { for (auto areaIt : RandomizerCheckObjects::GetAllRCAreas()) {
// todo fix this, it's hacky and copypasta // todo fix this, it's hacky and copypasta
bool hasItems = false; bool hasItems = false;
@ -3792,14 +3792,14 @@ void DrawRandoEditor(bool& open) {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
window->DC.CurrLineTextBaseOffset = 0.0f; window->DC.CurrLineTextBaseOffset = 0.0f;
ImGui::BeginChild("ChildVanillaLocations"); ImGui::BeginChild("ChildVanillaLocations", ImVec2(0, -8));
for (auto areaIt : RandomizerCheckObjects::GetAllRCAreas()) { for (auto areaIt : RandomizerCheckObjects::GetAllRCAreas()) {
// todo fix this, it's hacky and copypasta // todo fix this, it's hacky and copypasta
bool hasItems = false; bool hasItems = false;
for (auto locationIt : RandomizerCheckObjects::GetAllRCObjects()) { for (auto locationIt : RandomizerCheckObjects::GetAllRCObjects()) {
if (locationIt.second.visibleInImgui && if (locationIt.second.visibleInImgui &&
excludedLocations.count(locationIt.second.rc) && locationIt.second.rcArea == areaIt.first &&
locationIt.second.rcArea == areaIt.first) { excludedLocations.count(locationIt.second.rc)) {
hasItems = true; hasItems = true;
break; break;
@ -3812,8 +3812,8 @@ void DrawRandoEditor(bool& open) {
for (auto locationIt : RandomizerCheckObjects::GetAllRCObjects()) { for (auto locationIt : RandomizerCheckObjects::GetAllRCObjects()) {
auto elfound = excludedLocations.find(locationIt.first); auto elfound = excludedLocations.find(locationIt.first);
if (locationIt.second.visibleInImgui && if (locationIt.second.visibleInImgui &&
elfound != excludedLocations.end() && locationIt.second.rcArea == areaIt.first &&
locationIt.second.rcArea == areaIt.first) { elfound != excludedLocations.end()) {
if (ImGui::ArrowButton(std::to_string(locationIt.first).c_str(), ImGuiDir_Left)) { if (ImGui::ArrowButton(std::to_string(locationIt.first).c_str(), ImGuiDir_Left)) {
excludedLocations.erase(elfound); excludedLocations.erase(elfound);