Fix bug where sometimes navigating to directory browse would not correctly hightlight the "browse" button in the shortcuts bar

clangen · clangen · commit 6914702131c9 · 2021-04-12T21:59:30.000-07:00
diff --git a/src/musikcube/app/layout/LibraryLayout.cpp b/src/musikcube/app/layout/LibraryLayout.cpp
@@ -279,7 +279,9 @@ void LibraryLayout::UpdateShortcutsWindow() {
         if (this->shortcuts->IsFocused() && this->visibleLayout) {
             this->visibleLayout->SetFocus(IWindowPtr());
         }
-        if (this->visibleLayout == this->browseLayout) {
+        if (this->visibleLayout == this->browseLayout ||
+            this->visibleLayout == this->directoryLayout)
+        {
             this->shortcuts->SetActive(Hotkeys::Get(Hotkeys::NavigateLibraryBrowse));
         }
         else if (this->visibleLayout == nowPlayingLayout) {

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,9 @@ void LibraryLayout::UpdateShortcutsWindow() {`
`279`	`279`	`if (this->shortcuts->IsFocused() && this->visibleLayout) {`
`280`	`280`	`this->visibleLayout->SetFocus(IWindowPtr());`
`281`	`281`	`}`
`282`		`- if (this->visibleLayout == this->browseLayout) {`
	`282`	`+ if (this->visibleLayout == this->browseLayout \|\|`
	`283`	`+ this->visibleLayout == this->directoryLayout)`
	`284`	`+ {`
`283`	`285`	`this->shortcuts->SetActive(Hotkeys::Get(Hotkeys::NavigateLibraryBrowse));`
`284`	`286`	`}`
`285`	`287`	`else if (this->visibleLayout == nowPlayingLayout) {`