Merge branch 'master' into sysmgrtooltip_syschaninfo
This commit is contained in:
commit
e50b3438f2
834 changed files with 780920 additions and 160607 deletions
|
|
@ -32,10 +32,10 @@ DivSystem FurnaceGUI::systemPicker() {
|
|||
}
|
||||
|
||||
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
|
||||
if (ImGui::InputTextWithHint("##SysSearch","Search...",&sysSearchQuery)) reissueSearch=true;
|
||||
if (ImGui::InputTextWithHint("##SysSearch",_("Search..."),&sysSearchQuery)) reissueSearch=true;
|
||||
if (ImGui::BeginTabBar("SysCats")) {
|
||||
for (int i=0; chipCategories[i]; i++) {
|
||||
if (ImGui::BeginTabItem(chipCategoryNames[i])) {
|
||||
if (ImGui::BeginTabItem(_(chipCategoryNames[i]))) {
|
||||
if (ImGui::IsItemActive()) {
|
||||
reissueSearch=true;
|
||||
}
|
||||
|
|
@ -96,4 +96,4 @@ DivSystem FurnaceGUI::systemPicker() {
|
|||
}
|
||||
ImGui::EndChild();
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue