Skip to content

Commit 77f8b7a

Browse files
committed
fix: reduce app item border width and fix test RPATH
Reduced the border width of app items in the task manager from 2px to 1px for better visual aesthetics and consistency with the overall UI design. The thicker border was visually distracting and didn't align with the minimalist design principles. Added RPATH configuration for test executables to ensure they can find the required taskmanager plugin libraries at build time. This fixes runtime linking issues during testing by explicitly setting the runtime library search path to include the build directories where the plugins are located. Influence: 1. Verify app items in dock task manager have thinner borders 2. Check that the visual appearance is consistent and less intrusive 3. Run test executables to confirm they can load required libraries 4. Test both rolecombinemodel_tests and rolegroupmodel_tests executables 5. Verify no library loading errors during test execution fix: 减小应用项边框宽度并修复测试 RPATH 将任务管理器中应用项的边框宽度从 2px 减小到 1px,以获得更好的视觉效果 并与整体 UI 设计保持一致。较粗的边框在视觉上分散注意力,不符合简约设计 原则。 为测试可执行文件添加 RPATH 配置,确保它们在构建时能够找到所需的 taskmanager 插件库。通过显式设置运行时库搜索路径以包含插件所在的构建目 录,修复了测试期间的运行时链接问题。 Influence: 1. 验证坞站任务管理器中的应用项具有更细的边框 2. 检查视觉外观是否一致且不那么突兀 3. 运行测试可执行文件确认它们能够加载所需的库 4. 测试 rolecombinemodel_tests 和 rolegroupmodel_tests 可执行文件 5. 验证测试执行期间没有库加载错误
1 parent 6430c48 commit 77f8b7a

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

panels/dock/taskmanager/package/AppItemWithTitle.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Item {
132132
color: "transparent"
133133
antialiasing: true
134134
border.color: Qt.rgba(0, 0, 0, 0.1)
135-
border.width: 2
135+
border.width: 1
136136

137137
Rectangle {
138138
anchors.fill: parent

tests/panels/dock/taskmanager/CMakeLists.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,20 @@ target_include_directories(rolecombinemodel_tests PRIVATE
2626
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/
2727
)
2828

29+
# Set RPATH to find the taskmanager plugin library at build time
30+
set_target_properties(rolecombinemodel_tests PROPERTIES
31+
SKIP_BUILD_RPATH FALSE
32+
BUILD_WITH_INSTALL_RPATH FALSE
33+
BUILD_RPATH "${CMAKE_BINARY_DIR}/plugins:${CMAKE_BINARY_DIR}/frame"
34+
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
35+
)
36+
37+
# Add linker flags to set RPATH
38+
target_link_options(rolecombinemodel_tests PRIVATE
39+
"LINKER:-rpath,${CMAKE_BINARY_DIR}/plugins"
40+
"LINKER:-rpath,${CMAKE_BINARY_DIR}/frame"
41+
)
42+
2943
gtest_discover_tests(rolecombinemodel_tests)
3044

3145
add_executable(rolegroupmodel_tests
@@ -43,4 +57,18 @@ target_include_directories(rolegroupmodel_tests PRIVATE
4357
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/
4458
)
4559

60+
# Set RPATH to find the taskmanager plugin library at build time
61+
set_target_properties(rolegroupmodel_tests PROPERTIES
62+
SKIP_BUILD_RPATH FALSE
63+
BUILD_WITH_INSTALL_RPATH FALSE
64+
BUILD_RPATH "${CMAKE_BINARY_DIR}/plugins:${CMAKE_BINARY_DIR}/frame"
65+
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
66+
)
67+
68+
# Add linker flags to set RPATH
69+
target_link_options(rolegroupmodel_tests PRIVATE
70+
"LINKER:-rpath,${CMAKE_BINARY_DIR}/plugins"
71+
"LINKER:-rpath,${CMAKE_BINARY_DIR}/frame"
72+
)
73+
4674
gtest_discover_tests(rolegroupmodel_tests)

0 commit comments

Comments
 (0)