Skip to content

Commit 640c663

Browse files
committed
Fallback to owncloud sidebar icons if those are missing in the branding
1 parent 2f5547e commit 640c663

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

changelog/unreleased/9381

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Bugfix: Fallback to ownCloud sidebar icons on Mac if none provided in branding
2+
3+
If a customer does not provide sidebar icons we use the ownCloud sidebar icons.
4+
5+
6+
https://github.com/owncloud/client/pull/9381

cmake/modules/OCBundleResources.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ function(generate_theme TARGET OWNCLOUD_SIDEBAR_ICONS_OUT)
9595
else()
9696
file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${OEM_THEME_DIR}/theme/colored/*-${APPLICATION_ICON_NAME}-icon-sidebar.png")
9797
endif()
98+
if (NOT OWNCLOUD_SIDEBAR_ICONS)
99+
message(WARNING "The branding does not provide sidebar icons falling back to vanilla icons")
100+
file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${PROJECT_SOURCE_DIR}/theme/colored/*-owncloud-icon-sidebar.png")
101+
endif()
98102
set(${OWNCLOUD_SIDEBAR_ICONS_OUT} ${OWNCLOUD_SIDEBAR_ICONS} PARENT_SCOPE)
99103
endfunction()
100104

0 commit comments

Comments
 (0)