Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Mark label as selected when programatically calling selectCategory() #73

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: Mark label as selected when programatically calling selectCategory() #73

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9f0189
CategoryLabel: Make `category` field internal
caoimhebyrne Oct 30, 2022
7579045
CategoryLabel: Move visual selection logic to `markSelected()`
caoimhebyrne Oct 30, 2022
5bd7764
SettingsGui: Mark label as selected when calling `selectCategory()`
caoimhebyrne Oct 30, 2022
ce1b793
API: Update Vigilance.api
caoimhebyrne Oct 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/kotlin/gg/essential/vigilance/gui/SettingsGui.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,16 @@ class SettingsGui(
newCategory.scrollToTop()
currentCategory = newCategory

sidebarScroller.childrenOfType<CategoryLabel>().firstOrNull { it.isSelected }?.deselect()
val labels = sidebarScroller.childrenOfType<CategoryLabel>()

labels
.firstOrNull { it.isSelected }
?.deselect()

// We compare names because the `items` field could technically be the same but the `Category` could be a different instance.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But can the same argument not be made for name as well? Shouldn't we just compare by reference?

labels
.firstOrNull { it.category.name == category.name }
?.markSelected()
}

override fun updateGuiScale() {
Expand Down