Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ImGui v1.90.9 #13392

Merged
merged 12 commits into from
Dec 18, 2024
Merged

Update ImGui v1.90.9 #13392

merged 12 commits into from
Dec 18, 2024

Conversation

Noy-Zini
Copy link

@Noy-Zini Noy-Zini commented Oct 1, 2024

Traced on: [LRS-1129]

Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-alignment.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-alignment.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
@Nir-Az
Copy link
Collaborator

Nir-Az commented Oct 6, 2024

Note that once ready we will have to make a UI sanity to this change.
Including online updates windows, calibration windows and more

@Noy-Zini Noy-Zini force-pushed the Update_ImGui_v1.90.9 branch from 5ea88b8 to 48807d1 Compare October 6, 2024 13:01
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
common/option-model.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
common/option-model.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
common/subdevice-model.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
examples/example-imgui.hpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
examples/example-imgui.hpp Outdated Show resolved Hide resolved
@Noy-Zini Noy-Zini force-pushed the Update_ImGui_v1.90.9 branch from b1881af to dd72548 Compare November 19, 2024 12:37
@Noy-Zini Noy-Zini force-pushed the Update_ImGui_v1.90.9 branch from 844ac13 to 54a0dc3 Compare November 20, 2024 12:10
Nir-Az
Nir-Az reviewed Nov 20, 2024
View reviewed changes
common/ux-alignment.cpp Outdated Show resolved Hide resolved
@Noy-Zini Noy-Zini force-pushed the Update_ImGui_v1.90.9 branch 4 times, most recently from 79ed478 to 86d8f64 Compare November 26, 2024 14:02
@Noy-Zini Noy-Zini force-pushed the Update_ImGui_v1.90.9 branch from 86d8f64 to 4ed121d Compare November 26, 2024 14:20
@Noy-Zini Noy-Zini requested a review from Nir-Az November 26, 2024 15:47
Nir-Az
Nir-Az reviewed Nov 27, 2024
View reviewed changes
examples/example-imgui.hpp Outdated Show resolved Hide resolved
@Noy-Zini Noy-Zini force-pushed the Update_ImGui_v1.90.9 branch from 00a7344 to 41a586b Compare December 4, 2024 14:08
@Noy-Zini Noy-Zini requested a review from Nir-Az December 8, 2024 10:37
Nir-Az
Nir-Az reviewed Dec 8, 2024
View reviewed changes
common/device-model.cpp Outdated
if (ImGui::ButtonEx(record_button_name.c_str(), device_panel_icons_size, (disable_record_button_logic(is_streaming, is_playback_device)) ? ImGuiButtonFlags_Disabled : 0))
bool button_disabled = disable_record_button_logic(is_streaming, is_playback_device);
if (button_disabled)
ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(0.5f,0.5f,0.5f,1.f));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the flag ImGuiButtonFlags_Disabled was removed so I used ImGuiItemFlags_Disabled flag instead and it wasn't changing the button color (to dark gray). I searched more and found ImGui::BeginDisabled() function that does it better and used it instead.

Nir-Az
Nir-Az reviewed Dec 8, 2024
View reviewed changes
common/device-model.cpp Outdated
if (button_disabled)
ImGui::PushStyleColor(ImGuiCol_Text,ImVec4(0.5f,0.5f,0.5f,1.f));

if (ImGui::ButtonEx(record_button_name.c_str(), device_panel_icons_size, (disable_record_button_logic(is_streaming, is_playback_device)) ? ImGuiItemFlags_Disabled : 0))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have it on button_disabled no?

@Noy-Zini Noy-Zini force-pushed the Update_ImGui_v1.90.9 branch from a64e4a3 to c6188ef Compare December 10, 2024 13:00
@Noy-Zini Noy-Zini requested a review from Nir-Az December 10, 2024 13:37
@Nir-Az Nir-Az merged commit 5b1ea01 into IntelRealSense:development Dec 18, 2024
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nir-Az Nir-Az Nir-Az approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Noy-Zini @Nir-Az