Fixes hi-dpi on Linux

- Fixes incorrect install path for icons
- Fixes case-sensitive issues with names
This commit is contained in:
Pandagrapher 2022-12-08 10:03:45 +01:00
parent eb40593d60
commit cc48ad2aa1
3 changed files with 3 additions and 7 deletions

View File

@ -364,11 +364,7 @@ endif()
if(NOT DEFINED ICONSDIR) if(NOT DEFINED ICONSDIR)
if(UNIX) if(UNIX)
if(BUILD_BUNDLE) if(BUILD_BUNDLE)
if(APPLE) set(ICONSDIR "${DATADIR}/icons")
set(ICONSDIR "${DATADIR}/icons")
else()
set(ICONSDIR "${DATADIR}/share/icons")
endif()
else() else()
set(ICONSDIR "${CMAKE_INSTALL_PREFIX}/share/icons") set(ICONSDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
endif() endif()

View File

@ -52,7 +52,7 @@ install(DIRECTORY "${THEMEDIR}" DESTINATION "${DATADIR}")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/empty.png" DESTINATION "${ICONSDIR}/rawtherapee/24x24/apps") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/empty.png" DESTINATION "${ICONSDIR}/rawtherapee/24x24/apps")
install(FILES ${IMG_SVG} DESTINATION "${ICONSDIR}/rawtherapee/scalable/apps") install(FILES ${IMG_SVG} DESTINATION "${ICONSDIR}/rawtherapee/scalable/apps")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/svg/Index.theme" DESTINATION "${ICONSDIR}/rawtherapee") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/svg/index.theme" DESTINATION "${ICONSDIR}/rawtherapee")
install(FILES ${IMG_ICO} DESTINATION "${DATADIR}/images") install(FILES ${IMG_ICO} DESTINATION "${DATADIR}/images")
if(APPLE) if(APPLE)

View File

@ -112,7 +112,7 @@ RTWindow::RTWindow ()
// Setting default theme and icon theme (bases for custom themes) // Setting default theme and icon theme (bases for custom themes)
Gtk::Settings::get_for_screen (screen)->property_gtk_theme_name() = "Adwaita"; Gtk::Settings::get_for_screen (screen)->property_gtk_theme_name() = "Adwaita";
Gtk::Settings::get_for_screen (screen)->property_gtk_application_prefer_dark_theme() = true; Gtk::Settings::get_for_screen (screen)->property_gtk_application_prefer_dark_theme() = true;
Gtk::Settings::get_for_screen (screen)->property_gtk_icon_theme_name() = "RawTherapee"; Gtk::Settings::get_for_screen (screen)->property_gtk_icon_theme_name() = "rawtherapee";
// Initialize RTScalable for Hi-DPI support // Initialize RTScalable for Hi-DPI support
RTScalable::init(this); RTScalable::init(this);