Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-29 14:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Trophy pop-up and viewer enhancements (#2493)

Browse source 
* Include trophy rarity icons in pop up, remove newlines from viewer

Fix layout

Update platinum.png

Fix linux and apple

* Smaller type icons, center text vertically

* use original icons

* MacOS fixes

* Address Review comments

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

test

* Move trophy type to leftmost and trophy art to rightmost

* Embed resources

* Revert packaging of resources with builds

---------

Co-authored-by: rainmakerv2 <30595646+jpau02@users.noreply.github.com>
This commit is contained in:
rainmakerv2 2025-02-23 16:00:24 +08:00 • committed by GitHub
parent 4f1baece33
commit 22ca57b1f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 795 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

19
CMakeLists.txt
View file

@ -195,6 +195,7 @@ endif()
add_subdirectory(externals)
include_directories(src)
include_directories(Resources)
if(ENABLE_QT_GUI)
find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent LinguistTools Network Multimedia)
@ -953,6 +954,12 @@ set(QT_GUI src/qt_gui/about_dialog.cpp
)
endif()
set(RESOURCEFOLDER Resources/bronze.png
Resources/gold.png
Resources/platinum.png
Resources/silver.png
)
if (ENABLE_QT_GUI)
qt_add_executable(shadps4
${AUDIO_CORE}
@ -964,6 +971,7 @@ if (ENABLE_QT_GUI)
${SHADER_RECOMPILER}
${VIDEO_CORE}
${EMULATOR}
${RESOURCEFOLDER}
src/images/shadPS4.icns
)
else()
@ -976,6 +984,7 @@ else()
${SHADER_RECOMPILER}
${VIDEO_CORE}
${EMULATOR}
${RESOURCEFOLDER}
src/main.cpp
src/emulator.cpp
src/emulator.h
@ -1102,6 +1111,16 @@ add_subdirectory(${HOST_SHADERS_INCLUDE})
add_dependencies(shadps4 host_shaders)
target_include_directories(shadps4 PRIVATE ${HOST_SHADERS_INCLUDE})
# embed resources
include(CMakeRC)
cmrc_add_resource_library(embedded-resources
ALIAS res::embedded
NAMESPACE res
${RESOURCEFOLDER})
target_link_libraries(shadps4 PRIVATE res::embedded)
# ImGui resources
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/renderer)
add_dependencies(shadps4 ImGui_Resources)