Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复应用获取配置某些情况下可能失败的问题

Browse Source 
条件判断写的有问题，少了括号

Log: 修复应用获取配置某些情况下可能失败的问题
Change-Id: I0e9f447e4d904cba2aaea83fa77ce7c2f87cae08
This commit is contained in:
Fan PengCheng 2021-03-25 14:20:52 +08:00
parent 02c8cbb2d1
commit f46de5761e
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -28,7 +28,7 @@ if (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug"))
# generate qm # generate qm
execute_process(COMMAND bash "translate_generation.sh" execute_process(COMMAND bash "translate_generation.sh"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif () endif ()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_DEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_DEBUG")
@ -63,7 +63,7 @@ include_directories(
frame/window frame/window
frame/xcb frame/xcb
frame/mockinterface frame/mockinterface
) )
aux_source_directory(frame/controller CONTROLLER) aux_source_directory(frame/controller CONTROLLER)
aux_source_directory(frame/dbus DBUS) aux_source_directory(frame/dbus DBUS)
@ -89,7 +89,7 @@ file(GLOB SRC_PATH
${WINDOW} ${WINDOW}
${XCB} ${XCB}
${MOCKINTERFACE} ${MOCKINTERFACE}
) )
add_subdirectory("frame") add_subdirectory("frame")
add_subdirectory("plugins") add_subdirectory("plugins")
@ -103,17 +103,21 @@ endif ()
## qm files ## qm files
file(GLOB QM_FILES "translations/*.qm") file(GLOB QM_FILES "translations/*.qm")
install(FILES ${QM_FILES} install(FILES ${QM_FILES}
DESTINATION share/dde-dock/translations) DESTINATION share/dde-dock/translations)
## dev files ## dev files
install(FILES ${INTERFACES} install(FILES ${INTERFACES}
DESTINATION include/dde-dock) DESTINATION include/dde-dock)
install(FILES ${CMAKE_BINARY_DIR}/dde-dock.pc install(FILES ${CMAKE_BINARY_DIR}/dde-dock.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(FILES "cmake/DdeDock/DdeDockConfig.cmake" install(FILES "cmake/DdeDock/DdeDockConfig.cmake"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DdeDock) DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DdeDock)
install(FILES gschema/com.deepin.dde.dock.module.gschema.xml install(FILES gschema/com.deepin.dde.dock.module.gschema.xml
DESTINATION share/glib-2.0/schemas) DESTINATION share/glib-2.0/schemas)
# Address Sanitizer 内存错误检测工具,打开下面的编译选项可以看到调试信息，正常运行时不需要这些信息
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=address -O2")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -O2")

4
frame/CMakeLists.txt
View File

@ -65,7 +65,3 @@ endif()
# bin # bin
install(TARGETS ${BIN_NAME} DESTINATION bin) install(TARGETS ${BIN_NAME} DESTINATION bin)
# Address Sanitizer 内存错误检测工具,打开下面的编译选项可以看到调试信息，正常运行时不需要这些信息
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=address -O2")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -O2")

2
frame/item/appitem.cpp
View File

@ -710,7 +710,7 @@ void AppItem::onGSettingsChanged(const QString &key)
: m_activeAppSettings; : m_activeAppSettings;
if (setting && setting->keys().contains("enable")) { if (setting && setting->keys().contains("enable")) {
const bool isEnable = !m_appSettings || m_appSettings->keys().contains("enable") && m_appSettings->get("enable").toBool(); const bool isEnable = !m_appSettings || (m_appSettings->keys().contains("enable") && m_appSettings->get("enable").toBool());
setVisible(isEnable && setting->get("enable").toBool()); setVisible(isEnable && setting->get("enable").toBool());
} }
} }

4
tests/CMakeLists.txt
View File

@ -69,7 +69,3 @@ add_custom_command(TARGET check
) )
add_dependencies(check ${BIN_NAME}) add_dependencies(check ${BIN_NAME})
# Address Sanitizer 内存错误检测工具,打开下面的编译选项可以看到调试信息，正常运行时不需要这些信息
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=address -O2")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -O2")