Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[upstream_utils] Update imgui and implot (#8762)

Browse Source 
Not updating GLFW yet due to a likely future move to SDL.
This commit is contained in:
Peter Johnson
2026-04-12 12:19:32 -07:00
committed by GitHub
parent d76486d885
commit 476b9641c1
47 changed files with 27710 additions and 12792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glass/src/lib/native/cpp/Context.cpp
View File

@@ -543,8 +543,8 @@ bool wpi::glass::ItemEditName(std::string* name) {
if (ImGui::InputText("##editname", name)) {
rv = true;
}
if (ImGui::Button("Close") || ImGui::IsKeyPressedMap(ImGuiKey_Enter) ||
ImGui::IsKeyPressedMap(ImGuiKey_KeyPadEnter)) {
if (ImGui::Button("Close") || ImGui::IsKeyPressed(ImGuiKey_Enter) ||
ImGui::IsKeyPressed(ImGuiKey_KeypadEnter)) {
ImGui::CloseCurrentPopup();
}

2
glass/src/lib/native/cpp/hardware/Pneumatic.cpp
View File

@@ -59,9 +59,9 @@ bool wpi::glass::DisplayPneumaticControlSolenoids(PneumaticControlModel* model,
// header
bool open = CollapsingHeader(label);
ImGui::SetNextItemAllowOverlap();
PopupEditName("header", &name);
ImGui::SetItemAllowOverlap();
ImGui::SameLine();
// show channels as LED indicators

14
glass/src/lib/native/cpp/other/Plot.cpp
View File

@@ -384,12 +384,12 @@ PlotSeries::Action PlotSeries::EmitPlot(PlotView& view, double now, size_t i,
if (m_color.GetColorFloat()[3] == IMPLOT_AUTO) {
SetColor(ImPlot::GetColormapColor(i));
}
ImPlot::SetNextLineStyle(m_color.GetColor(), m_weight);
ImPlotSpec spec{ImPlotProp_LineColor, m_color.GetColor(),
ImPlotProp_LineWeight, m_weight};
if (IsDigital()) {
ImPlot::PushStyleVar(ImPlotStyleVar_DigitalBitHeight, m_digitalBitHeight);
ImPlot::PushStyleVar(ImPlotStyleVar_DigitalBitGap, m_digitalBitGap);
ImPlot::PlotDigitalG(label, getter, &getterData, size + 1);
ImPlot::PopStyleVar();
spec.SetProp(ImPlotProp_Size, m_digitalBitHeight);
ImPlot::PushStyleVar(ImPlotStyleVar_DigitalSpacing, m_digitalBitGap);
ImPlot::PlotDigitalG(label, getter, &getterData, size + 1, spec);
ImPlot::PopStyleVar();
} else {
if (ImPlot::GetCurrentPlot()->YAxis(m_yAxis).Enabled) {
@@ -397,8 +397,8 @@ PlotSeries::Action PlotSeries::EmitPlot(PlotView& view, double now, size_t i,
} else {
ImPlot::SetAxis(ImAxis_Y1);
}
ImPlot::SetNextMarkerStyle(m_marker.GetValue() - 1);
ImPlot::PlotLineG(label, getter, &getterData, size + 1);
spec.SetProp(ImPlotProp_Marker, m_marker.GetValue() - 1);
ImPlot::PlotLineG(label, getter, &getterData, size + 1, spec);
}
// DND source for PlotSeries

8
glass/src/lib/native/cpp/support/NameSetting.cpp
View File

@@ -97,8 +97,8 @@ bool NameSetting::PopupEditName(int index) {
if (InputTextName("##edit")) {
rv = true;
}
if (ImGui::Button("Close") || ImGui::IsKeyPressedMap(ImGuiKey_Enter) ||
ImGui::IsKeyPressedMap(ImGuiKey_KeyPadEnter)) {
if (ImGui::Button("Close") || ImGui::IsKeyPressed(ImGuiKey_Enter) ||
ImGui::IsKeyPressed(ImGuiKey_KeypadEnter)) {
ImGui::CloseCurrentPopup();
}
ImGui::EndPopup();
@@ -117,8 +117,8 @@ bool NameSetting::PopupEditName(const char* name) {
if (InputTextName("##edit")) {
rv = true;
}
if (ImGui::Button("Close") || ImGui::IsKeyPressedMap(ImGuiKey_Enter) ||
ImGui::IsKeyPressedMap(ImGuiKey_KeyPadEnter)) {
if (ImGui::Button("Close") || ImGui::IsKeyPressed(ImGuiKey_Enter) ||
ImGui::IsKeyPressed(ImGuiKey_KeypadEnter)) {
ImGui::CloseCurrentPopup();
}
ImGui::EndPopup();