feedc0de/esp-gui-lib
1
0
Fork 0
Code Issues 6 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Fixed closing of popups

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-01-23 20:31:06 +01:00
parent ec7ddb8dea
commit 7cfa4b85e1
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/popupdisplay.cpp
View File

@ -19,17 +19,11 @@ void PopupDisplay::initScreen(TftInterface &tft)
initOverlay(tft); initOverlay(tft);
} }
void PopupDisplay::redraw(TftInterface &tft)
{
if (m_wantsClose)
closeOverlay(tft);
else
Base::redraw(tft);
}
void PopupDisplay::closeOverlay() void PopupDisplay::closeOverlay()
{ {
m_wantsClose = true; espgui::changeScreenCallback = [this](espgui::TftInterface &tft){
closeOverlay(tft);
};
} }
void PopupDisplay::closeOverlay(TftInterface &tft) void PopupDisplay::closeOverlay(TftInterface &tft)

4
src/popupdisplay.h
View File

@ -17,16 +17,12 @@ public:
void initScreen(TftInterface &tft) override; void initScreen(TftInterface &tft) override;
void redraw(TftInterface &tft) override;
virtual void initOverlay(TftInterface &tft) = 0; virtual void initOverlay(TftInterface &tft) = 0;
void closeOverlay(); void closeOverlay();
void closeOverlay(TftInterface &tft); void closeOverlay(TftInterface &tft);
private: private:
std::unique_ptr<Display> m_lastDisplay; std::unique_ptr<Display> m_lastDisplay;
bool m_wantsClose{};
}; };
} // namespace espgui } // namespace espgui