mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 20:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix re-focus behavior to ensure SOMETHING always gets focused when

Browse Source 
switching screens.
This commit is contained in:
casey langen 2020-10-12 10:55:39 -07:00
parent bba8c7091a
commit 3d0b2de319
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/musikcube/cursespp/AppLayout.cpp
View File

@ -41,6 +41,8 @@
using namespace cursespp;
/* TODO: this seems to be busted in many cases; either fix the
implementation or get rid of this. */
static std::map<ILayout*, int> lastFocusMap;
#define ENABLE_DEMO_MODE 0
@ -155,8 +157,8 @@ IWindowPtr AppLayout::FocusPrev() {
void AppLayout::SetLayout(std::shared_ptr<cursespp::LayoutBase> layout) {
if (layout != this->layout) {
if (this->layout) {
this->RemoveWindow(this->layout);
last(this->layout.get(), this->layout->GetFocusIndex());
this->RemoveWindow(this->layout);
this->layout->Hide();
}
@ -180,7 +182,7 @@ void AppLayout::SetLayout(std::shared_ptr<cursespp::LayoutBase> layout) {
this->Layout();
if (!this->shortcuts->IsFocused()) {
auto lastFocusIndex = last(this->layout.get());
auto lastFocusIndex = std::max(0, last(this->layout.get()));
this->layout->SetFocusIndex(lastFocusIndex);
}
}