Handle offset on UI when graphics driver is not updated #2546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dorodnic
suggested changes
Oct 17, 2018
common/model-views.h
Outdated
| @@ -855,6 +855,8 @@ namespace rs2 | |||
|
|
|||
| void popup_if_error(ImFont* font, std::string& error_message); | |||
|
|
|||
| void popup_if_ui_not_aligned(ImFont* font); | |||
There was a problem hiding this comment.
tabs
Suggested change
| void popup_if_ui_not_aligned(ImFont* font); | |
| void popup_if_ui_not_aligned(ImFont* font); |
common/model-views.h
Outdated
| @@ -904,6 +906,8 @@ namespace rs2 | |||
| float dim_level = 1.f; | |||
|
|
|||
| rs2::asynchronous_syncer s; | |||
|
|
|||
| bool continue_with_ui_not_aligned = false; | |||
There was a problem hiding this comment.
Suggested change
| bool continue_with_ui_not_aligned = false; | |
| bool continue_with_ui_not_aligned = false; |
common/ux-alignment.cpp
Outdated
| { | ||
| auto hwn = glfwGetWin32Window(win); | ||
| if (hwn == nullptr) | ||
| return false; |
There was a problem hiding this comment.
If you encounter error during check I'd expect the function to return true, not false because you have zero evidence to support UI-misalignment
common/ux-alignment.cpp
Outdated
|
|
||
| auto DrawList = ImGui::GetWindowDrawList(); | ||
| if (DrawList == nullptr) | ||
| return false; |
|
|
||
| #define MAGIC 250 | ||
|
|
||
| bool is_gui_aligned(GLFWwindow *win) |
There was a problem hiding this comment.
This function deserves and requires a great comment.
There is no way to guess from the code what you are trying to do and why
common/ux-window.h
Outdated
| @@ -92,5 +94,7 @@ namespace rs2 | |||
| bool _fullscreen_pressed = false; | |||
| bool _fullscreen = false; | |||
| std::string _title; | |||
|
|
|||
| bool _is_ui_aligned = false; | |||
There was a problem hiding this comment.
Suggested change
| bool _is_ui_aligned = false; | |
| bool _is_ui_aligned = false; |
tools/depth-quality/CMakeLists.txt
Outdated
| @@ -48,6 +48,8 @@ endif() | |||
| ../../third-party/imgui/imgui_impl_glfw.cpp | |||
| ../../third-party/imgui/imgui-fonts-karla.hpp | |||
| ../../third-party/imgui/imgui-fonts-fontawesome.hpp | |||
| ../../common/ux-alignment.cpp | |||
| @@ -434,6 +434,10 @@ namespace rs2 | |||
|
|
|||
| void tool_model::render(ux_window& win) | |||
| { | |||
| if (!win.is_ui_aligned()) | |||
| @@ -45,13 +45,15 @@ endif() | |||
| ../../common/model-views.cpp | |||
| ../../common/ux-window.h | |||
| ../../common/ux-window.cpp | |||
| ../../common/ux-alignment.cpp | |||
| @@ -273,6 +273,10 @@ int main(int argv, const char** argc) try | |||
| // Closing the window | |||
| while (window) | |||
| { | |||
| if (!window.is_ui_aligned()) | |||
dorodnic
approved these changes
Oct 21, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When graphics driver is not up to date there is sometimes misalignment in the viewer UI:
In this PR I added code that detects this situation, notifies the user and suggests a link to the updated driver:
