mirrors/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-09-30 23:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

make hyprerror follow fadein anim

Browse Source
This commit is contained in:
vaxerski
2023-01-20 20:48:07 +01:00
parent 18330dec4e
commit 5814d9b2a0
5 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/hyprerror/HyprError.cpp
View File

@@ -1,6 +1,15 @@
#include "HyprError.hpp"
#include "../Compositor.hpp"
CHyprError::CHyprError() {
m_fFadeOpacity.create(AVARTYPE_FLOAT, g_pConfigManager->getAnimationPropertyConfig("fadeIn"), nullptr, AVARDAMAGE_NONE);
m_fFadeOpacity.registerVar();
}
CHyprError::~CHyprError() {
m_fFadeOpacity.unregister();
}
void CHyprError::queueCreate(std::string message, const CColor& color) {
m_szQueued = message;
m_cQueued = color;
@@ -12,6 +21,9 @@ void CHyprError::createQueued() {
m_tTexture.destroyTexture();
}
m_fFadeOpacity.setValueAndWarp(0.f);
m_fFadeOpacity = 1.f;
const auto PMONITOR = g_pCompositor->m_vMonitors.front().get();
const auto SCALE = PMONITOR->scale;
@@ -40,6 +52,8 @@ void CHyprError::createQueued() {
const double WIDTH = PMONITOR->vecPixelSize.x - PAD * 2;
const double HEIGHT = (FONTSIZE + 2 * (FONTSIZE / 10.0)) * LINECOUNT + 3;
m_bDamageBox = {(int)PMONITOR->vecPosition.x, (int)PMONITOR->vecPosition.y, (int)PMONITOR->vecPixelSize.x, (int)HEIGHT + (int)PAD * 2};
cairo_new_sub_path(CAIRO);
cairo_arc(CAIRO, X + WIDTH - RADIUS, Y + RADIUS, RADIUS, -90 * DEGREES, 0 * DEGREES);
cairo_arc(CAIRO, X + WIDTH - RADIUS, Y + HEIGHT - RADIUS, RADIUS, 0 * DEGREES, 90 * DEGREES);
@@ -107,12 +121,17 @@ void CHyprError::draw() {
}
if (m_bQueuedDestroy) {
m_bQueuedDestroy = false;
m_tTexture.destroyTexture();
m_bIsCreated = false;
m_szQueued = "";
g_pHyprRenderer->damageMonitor(g_pCompositor->m_vMonitors.front().get());
return;
if (!m_fFadeOpacity.isBeingAnimated()) {
if (m_fFadeOpacity.fl() == 0.f) {
m_bQueuedDestroy = false;
m_tTexture.destroyTexture();
m_bIsCreated = false;
m_szQueued = "";
return;
} else {
m_fFadeOpacity = 0.f;
}
}
}
const auto PMONITOR = g_pCompositor->m_vMonitors.front().get();
@@ -120,9 +139,12 @@ void CHyprError::draw() {
if (g_pHyprOpenGL->m_RenderData.pMonitor != PMONITOR)
return; // wrong mon
wlr_box windowBox = {0, 0, PMONITOR->vecPixelSize.x, PMONITOR->vecPixelSize.y};
wlr_box monbox = {0, 0, PMONITOR->vecPixelSize.x, PMONITOR->vecPixelSize.y};
g_pHyprOpenGL->renderTexture(m_tTexture, &windowBox, 1.f, 0);
if (m_fFadeOpacity.isBeingAnimated())
g_pHyprRenderer->damageBox(&m_bDamageBox);
g_pHyprOpenGL->renderTexture(m_tTexture, &monbox, m_fFadeOpacity.fl(), 0);
}
void CHyprError::destroy() {