muskit/spice2x.github.io
0
0
Fork 0
mirror of https://github.com/spice2x/spice2x.github.io.git synced 2026-08-01 22:30:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

imgui: update imgui to v1.92.7, update dx9 backend to latest (#605)

Browse Source
This commit is contained in:
bicarus
2026-04-03 01:51:08 -07:00
committed by GitHub
parent 5af3e0d494
commit 1ad6a9412e
17 changed files with 13949 additions and 7546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spice2x/overlay/windows/config.cpp
+10 -15
View File
@@ -2196,9 +2196,8 @@ namespace overlay::windows {
auto analog_device_changed = ImGui::Combo(
"Device",
&this->analogs_devices_selected,
[](void* data, int i, const char **item) {
*item = ((std::vector<rawinput::Device*>*) data)->at(i)->desc.c_str();
return true;
[](void* data, int i) {
return ((std::vector<rawinput::Device*>*) data)->at(i)->desc.c_str();
},
&this->analogs_devices, (int) this->analogs_devices.size());
@@ -2317,9 +2316,8 @@ namespace overlay::windows {
// controls
ImGui::Combo("Control",
&this->analogs_devices_control_selected,
[](void* data, int i, const char **item) {
*item = ((std::vector<std::string>*) data)->at(i).c_str();
return true;
[](void* data, int i) {
return ((std::vector<std::string>*) data)->at(i).c_str();
},
&control_names, control_names.size());
@@ -2957,9 +2955,8 @@ namespace overlay::windows {
bool control_changed = false;
if (ImGui::Combo("Device",
&this->lights_devices_selected,
[] (void* data, int i, const char **item) {
*item = ((std::vector<rawinput::Device*>*) data)->at(i)->desc.c_str();
return true;
[] (void* data, int i) {
return ((std::vector<rawinput::Device*>*) data)->at(i)->desc.c_str();
},
&this->lights_devices, (int) this->lights_devices.size())) {
this->lights_devices_control_selected = 0;
@@ -3054,9 +3051,8 @@ namespace overlay::windows {
// controls
if (ImGui::Combo("Light Control",
&this->lights_devices_control_selected,
[] (void* data, int i, const char **item) {
*item = ((std::vector<std::string> *) data)->at(i).c_str();
return true;
[] (void* data, int i) {
return ((std::vector<std::string> *) data)->at(i).c_str();
},
&control_names, control_names.size())) {
control_changed = true;
@@ -3137,10 +3133,9 @@ namespace overlay::windows {
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
bool device_changed = ImGui::Combo("##AutoMatchDevice",
&this->auto_match_device_selected,
[] (void* data, int i, const char **item) {
[] (void* data, int i) {
auto *devs = (std::vector<rawinput::Device*>*) data;
*item = devs->at(i)->desc.c_str();
return true;
return devs->at(i)->desc.c_str();
},
&this->auto_match_devices,
(int) this->auto_match_devices.size());