Skip to content

Commit 057e616

Browse files
Fix rviz on high-dpi screens (fix #102)
1 parent c2b4827 commit 057e616

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

patch/ros-noetic-rviz.patch

+13
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,16 @@ index 8cd53337..a107d537 100644
8989
}
9090

9191
switch (gl_version_)
92+
diff --git a/src/rviz/ogre_helpers/render_widget.cpp b/src/rviz/ogre_helpers/render_widget.cpp
93+
index c2b2e36c..88f07d29 100644
94+
--- a/src/rviz/ogre_helpers/render_widget.cpp
95+
+++ b/src/rviz/ogre_helpers/render_widget.cpp
96+
@@ -98,7 +98,7 @@ void RenderWidget::resizeEvent(QResizeEvent* e)
97+
* So here we just always force it to be even. */
98+
const int w = width() * pixel_ratio_;
99+
render_window_->resize(w + (w % 2), height() * pixel_ratio_);
100+
-#if OGRE_VERSION < OGRE_VERSION_CHECK(1, 10, 0)
101+
+#if OGRE_VERSION < OGRE_VERSION_CHECK(1, 12, 0)
102+
render_window_->windowMovedOrResized();
103+
#endif
104+
}

vinca_linux_64.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ packages_select_by_deps:
3939
##
4040
# TODO Linux
4141
##
42-
- ur_client_library
42+
- rviz
43+
# - ur_client_library
4344
# - realsense2_camera
4445
# - franka_example_controllers
4546
# - franka_ros

vinca_osx.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ packages_select_by_deps:
3636
##
3737
# DONE OSX
3838
##
39-
- ur_client_library
39+
- rviz
40+
# - ur_client_library
4041
# - realsense2_camera
4142
# - tf2_web_republisher
4243
# - franka_ros

vinca_win.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ packages_select_by_deps:
3434
##
3535
# DONE Win
3636
##
37-
- rosserial_windows
37+
- rviz
38+
# - rosserial_windows
3839
# - turtlebot3_fake
3940
# - rosserial
4041
# - librealsense2

0 commit comments

Comments
 (0)