From 0998d1837dc3b05e063e2af5537918733314cd81 Mon Sep 17 00:00:00 2001 From: dreamer Date: Sat, 21 Feb 2026 12:10:09 +0100 Subject: [PATCH 1/2] move NanoVG::restore() down; add optional onNanoDisplayAfter() --- dgl/NanoVG.hpp | 1 + dgl/src/NanoVG.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dgl/NanoVG.hpp b/dgl/NanoVG.hpp index f9c5eb7d7..977946f7c 100644 --- a/dgl/NanoVG.hpp +++ b/dgl/NanoVG.hpp @@ -962,6 +962,7 @@ class NanoBaseWidget : public BaseWidget, @see onDisplay */ virtual void onNanoDisplay() = 0; + virtual void onNanoDisplayAfter() {} private: /** diff --git a/dgl/src/NanoVG.cpp b/dgl/src/NanoVG.cpp index 56546d76b..3c88f54ca 100644 --- a/dgl/src/NanoVG.cpp +++ b/dgl/src/NanoVG.cpp @@ -1135,14 +1135,16 @@ inline void NanoBaseWidget::onDisplay() NanoVG::save(); translate(SubWidget::getAbsoluteX(), SubWidget::getAbsoluteY()); onNanoDisplay(); - NanoVG::restore(); displayChildren(); + onNanoDisplayAfter(); + NanoVG::restore(); } else { NanoVG::beginFrame(SubWidget::getWidth(), SubWidget::getHeight()); onNanoDisplay(); displayChildren(); + onNanoDisplayAfter(); NanoVG::endFrame(); } } From 99d8dbc88262f468f0fb7460076c38a01d447563 Mon Sep 17 00:00:00 2001 From: dreamer Date: Sat, 21 Feb 2026 12:33:31 +0100 Subject: [PATCH 2/2] remove onNanoDisplayAfter() --- dgl/NanoVG.hpp | 1 - dgl/src/NanoVG.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/dgl/NanoVG.hpp b/dgl/NanoVG.hpp index 977946f7c..f9c5eb7d7 100644 --- a/dgl/NanoVG.hpp +++ b/dgl/NanoVG.hpp @@ -962,7 +962,6 @@ class NanoBaseWidget : public BaseWidget, @see onDisplay */ virtual void onNanoDisplay() = 0; - virtual void onNanoDisplayAfter() {} private: /** diff --git a/dgl/src/NanoVG.cpp b/dgl/src/NanoVG.cpp index 3c88f54ca..01d6a42b4 100644 --- a/dgl/src/NanoVG.cpp +++ b/dgl/src/NanoVG.cpp @@ -1136,7 +1136,6 @@ inline void NanoBaseWidget::onDisplay() translate(SubWidget::getAbsoluteX(), SubWidget::getAbsoluteY()); onNanoDisplay(); displayChildren(); - onNanoDisplayAfter(); NanoVG::restore(); } else @@ -1144,7 +1143,6 @@ inline void NanoBaseWidget::onDisplay() NanoVG::beginFrame(SubWidget::getWidth(), SubWidget::getHeight()); onNanoDisplay(); displayChildren(); - onNanoDisplayAfter(); NanoVG::endFrame(); } }