berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

fade in menus; bugfixes

This commit is contained in:
nakst 2021-09-26 16:40:08 +01:00
parent 9344e3a27a
commit fd26bec3d6
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
desktop/gui.cpp
View File

@ -932,6 +932,8 @@ EsWindow *EsWindowCreate(EsInstance *instance, EsWindowStyle style) {
window->mainPanel = panel; window->mainPanel = panel;
EsElementStartTransition(window, ES_TRANSITION_FADE_IN);
EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, window->handle, ES_WINDOW_SOLID_TRUE, panel->currentStyle->insets.l, ES_WINDOW_PROPERTY_SOLID); EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, window->handle, ES_WINDOW_SOLID_TRUE, panel->currentStyle->insets.l, ES_WINDOW_PROPERTY_SOLID);
EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, window->handle, BLEND_WINDOW_MATERIAL_GLASS, 0, ES_WINDOW_PROPERTY_MATERIAL); EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, window->handle, BLEND_WINDOW_MATERIAL_GLASS, 0, ES_WINDOW_PROPERTY_MATERIAL);
} }
@ -1272,6 +1274,8 @@ void EsElementStartTransition(EsElement *element, EsTransitionType transitionTyp
uint32_t durationMs = timeMultiplier * GetConstantNumber("transitionTime") * api.global->animationTimeMultiplier; uint32_t durationMs = timeMultiplier * GetConstantNumber("transitionTime") * api.global->animationTimeMultiplier;
if (!durationMs) { if (!durationMs) {
EsMessage m = { .type = ES_MSG_TRANSITION_COMPLETE };
EsMessageSend(element, &m);
return; return;
} }
@ -1356,12 +1360,14 @@ void EsElement::Repaint(bool all, EsRectangle region) {
Rectangle16 clipInsets = parent->currentStyle->metrics->clipInsets; Rectangle16 clipInsets = parent->currentStyle->metrics->clipInsets;
region = EsRectangleIntersection(region, EsRectangleAddBorder(parentBounds, RECT16_TO_RECT(clipInsets))); region = EsRectangleIntersection(region, EsRectangleAddBorder(parentBounds, RECT16_TO_RECT(clipInsets)));
} }
UIWindowNeedsUpdate(window);
} }
if (THEME_RECT_VALID(region)) { if (window) {
window->updateRegion = EsRectangleBounding(window->updateRegion, region); if (THEME_RECT_VALID(region)) {
window->updateRegion = EsRectangleBounding(window->updateRegion, region);
}
UIWindowNeedsUpdate(window);
} }
} }
@ -1648,22 +1654,22 @@ void ProcessAnimations() {
if (element->transitionDurationMs) { if (element->transitionDurationMs) {
element->Repaint(true, ES_RECT_1(0)); element->Repaint(true, ES_RECT_1(0));
}
if (transitionComplete) { if (transitionComplete) {
element->transitionDurationMs = 0; element->transitionDurationMs = 0;
if (element->previousTransitionFrame) { if (element->previousTransitionFrame) {
EsPaintTargetDestroy(element->previousTransitionFrame); EsPaintTargetDestroy(element->previousTransitionFrame);
element->previousTransitionFrame = nullptr; element->previousTransitionFrame = nullptr;
}
if (element->transitionFlags & ES_ELEMENT_TRANSITION_HIDE_AFTER_COMPLETE) {
EsElementSetHidden(element, true);
}
EsMessage m = { .type = ES_MSG_TRANSITION_COMPLETE };
EsMessageSend(element, &m);
} }
if (element->transitionFlags & ES_ELEMENT_TRANSITION_HIDE_AFTER_COMPLETE) {
EsElementSetHidden(element, true);
}
EsMessage m = { .type = ES_MSG_TRANSITION_COMPLETE };
EsMessageSend(element, &m);
} }
bool backgroundAnimationComplete = ThemeAnimationComplete(&element->animation); bool backgroundAnimationComplete = ThemeAnimationComplete(&element->animation);