From 79df07deb9d067858120904be6fb3bb10d632bfc Mon Sep 17 00:00:00 2001 From: Kaley Fischer Date: Sat, 25 Nov 2023 03:37:49 +0100 Subject: [PATCH] update: 2 --- src/config/ConfigManager.cpp | 7 ++++--- src/render/OpenGL.cpp | 2 +- src/render/Renderer.cpp | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 5bdc058b..2e86e4e3 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -189,7 +189,7 @@ void CConfigManager::setDefaultVars() { configValues["dwindle:force_split"].intValue = 0; configValues["dwindle:permanent_direction_override"].intValue = 0; configValues["dwindle:preserve_split"].intValue = 0; - configValues["dwindle:special_scale_factor"].floatValue = 0.8f; + configValues["dwindle:special_scale_factor"].floatValue = 1.f; configValues["dwindle:split_width_multiplier"].floatValue = 1.0f; configValues["dwindle:no_gaps_when_only"].intValue = 0; configValues["dwindle:use_active_for_splits"].intValue = 1; @@ -197,7 +197,7 @@ void CConfigManager::setDefaultVars() { configValues["dwindle:smart_split"].intValue = 0; configValues["dwindle:smart_resizing"].intValue = 1; - configValues["master:special_scale_factor"].floatValue = 0.8f; + configValues["master:special_scale_factor"].floatValue = 1.f; configValues["master:mfact"].floatValue = 0.55f; configValues["master:new_is_master"].intValue = 1; configValues["master:always_center_master"].intValue = 0; @@ -209,7 +209,8 @@ void CConfigManager::setDefaultVars() { configValues["master:smart_resizing"].intValue = 1; configValues["master:drop_at_cursor"].intValue = 1; - configValues["animations:enabled"].intValue = 1; + configValues["animations:enabled"].intValue = 1; + configValues["animations:first_launch_animation"].intValue = 1; configValues["input:follow_mouse"].intValue = 1; configValues["input:mouse_refocus"].intValue = 1; diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index 34b37f60..3bf44e52 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -202,7 +202,7 @@ void CHyprOpenGLImpl::begin(CMonitor* pMonitor, CRegion* pDamage, bool fake) { const auto PRBO = g_pHyprRenderer->getCurrentRBO(); - if (m_sFinalScreenShader.program > 0 || m_bFakeFrame || m_RenderData.mouseZoomFactor != 1.0 || pMonitor->vecPixelSize != PRBO->getFB()->m_vSize || + if (m_sFinalScreenShader.program > 0 || m_bFakeFrame || m_RenderData.mouseZoomFactor != 1.0 || pMonitor->vecPixelSize != PRBO->getFB()->m_vSize || !pMonitor->mirrors.empty() || passRequiresIntrospection(pMonitor)) { // we have to offload // bind the primary Hypr Framebuffer diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 945b4aad..864d21ad 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -884,6 +884,7 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) { static auto* const PRENDERTEX = &g_pConfigManager->getConfigValuePtr("misc:disable_hyprland_logo")->intValue; static auto* const PBACKGROUNDCOLOR = &g_pConfigManager->getConfigValuePtr("misc:background_color")->intValue; static auto* const PANIMENABLED = &g_pConfigManager->getConfigValuePtr("animations:enabled")->intValue; + static auto* const PFIRSTLAUNCHANIM = &g_pConfigManager->getConfigValuePtr("animations:first_launch_animation")->intValue; static auto* const PTEARINGENABLED = &g_pConfigManager->getConfigValuePtr("general:allow_tearing")->intValue; static int damageBlinkCleanup = 0; // because double-buffered @@ -892,7 +893,7 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) { damageBlinkCleanup = 0; static bool firstLaunch = true; - static bool firstLaunchAnimActive = true; + static bool firstLaunchAnimActive = *PFIRSTLAUNCHANIM; float zoomInFactorFirstLaunch = 1.f;