Merge branch 'master' into noLegacySample
This commit is contained in:
commit
aa8054754c
4 changed files with 26 additions and 4 deletions
|
|
@ -1757,6 +1757,20 @@ bool FurnaceFilePicker::draw(ImGuiWindowFlags winFlags) {
|
|||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (dirSelect) {
|
||||
finalSelection.push_back(path);
|
||||
curStatus=FP_STATUS_ACCEPTED;
|
||||
if (noClose) {
|
||||
for (FileEntry* j: chosenEntries) {
|
||||
j->isSelected=false;
|
||||
}
|
||||
chosenEntries.clear();
|
||||
updateEntryName();
|
||||
} else {
|
||||
isOpen=false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,14 @@ void FurnaceGUI::drawRegView() {
|
|||
} else {
|
||||
ImGui::PushFont(patFont);
|
||||
if (ImGui::BeginTable("Memory",17)) {
|
||||
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed);
|
||||
float widthOne=ImGui::CalcTextSize("0").x;
|
||||
if (size>0xfff) { // no im got gonna put some clamped log formula instead
|
||||
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed, widthOne*4.0f);
|
||||
} else if (size>0xff) {
|
||||
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed, widthOne*3.0f);
|
||||
} else {
|
||||
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed, widthOne*2.0f);
|
||||
}
|
||||
|
||||
ImGui::TableNextRow();
|
||||
ImGui::TableNextColumn();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue