From 8df121070ae5ca994ffe58ae1cff836b949c84d6 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Sat, 2 Jul 2022 15:09:59 +0200 Subject: [PATCH] wallpapers are now cover --- src/Hyprpaper.cpp | 22 +++++++++++++++++++--- src/render/WallpaperTarget.cpp | 2 ++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/Hyprpaper.cpp b/src/Hyprpaper.cpp index cffe02b..4e32e37 100644 --- a/src/Hyprpaper.cpp +++ b/src/Hyprpaper.cpp @@ -216,9 +216,25 @@ void CHyprpaper::renderWallpaperForMonitor(SMonitor* pMonitor) { exit(1); } - Debug::log(LOG, "Scale: %i", pMonitor->scale); - cairo_scale(PCAIRO, pMonitor->scale, pMonitor->scale); - cairo_set_source_surface(PCAIRO, PWALLPAPERTARGET->m_pCairoSurface, 0, 0); + // get scale + // we always do cover + float scale; + Vector2D origin; + if (pMonitor->size.x / pMonitor->size.y > PWALLPAPERTARGET->m_vSize.x / PWALLPAPERTARGET->m_vSize.y) { + scale = pMonitor->size.x / PWALLPAPERTARGET->m_vSize.x; + + origin.y = - (PWALLPAPERTARGET->m_vSize.y * scale - pMonitor->size.y) / 2.f / scale; + + } else { + scale = pMonitor->size.y / PWALLPAPERTARGET->m_vSize.y; + + origin.x = - (PWALLPAPERTARGET->m_vSize.x * scale - pMonitor->size.x) / 2.f / scale; + } + + Debug::log(LOG, "Image data for %s: %s at [%.2f, %.2f], scale: %.2f (original image size: [%i, %i])", pMonitor->name.c_str(), PWALLPAPERTARGET->m_szPath.c_str(), origin.x, origin.y, scale, (int)PWALLPAPERTARGET->m_vSize.x, (int)PWALLPAPERTARGET->m_vSize.y); + + cairo_scale(PCAIRO, scale, scale); + cairo_set_source_surface(PCAIRO, PWALLPAPERTARGET->m_pCairoSurface, origin.x, origin.y); cairo_paint(PCAIRO); cairo_restore(PCAIRO); diff --git a/src/render/WallpaperTarget.cpp b/src/render/WallpaperTarget.cpp index 5e3499d..a6cc607 100644 --- a/src/render/WallpaperTarget.cpp +++ b/src/render/WallpaperTarget.cpp @@ -21,5 +21,7 @@ void CWallpaperTarget::create(const std::string& path) { exit(1); } + m_vSize = { cairo_image_surface_get_width(CAIROSURFACE), cairo_image_surface_get_height(CAIROSURFACE) }; + m_pCairoSurface = CAIROSURFACE; } \ No newline at end of file