Skip to content

Fix menu items of type “Header” if no action is assigned to them #1509

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

Open
Sveninndh wants to merge 3 commits into
base: public/9.1
Choose a base branch
from
+7 −1
Open

Fix menu items of type “Header” if no action is assigned to them #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf08901
Fix menu items of type “Header” if no action is assigned to them
Sveninndh Feb 6, 2026
dfa7ea5
Fix menu items of type “Header” if no action is assigned to them
Sveninndh Feb 6, 2026
bf54dcf
Fix menu items of type “Header” if no action is assigned to them
Sveninndh Feb 8, 2026
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
6 changes: 6 additions & 0 deletions Slim/Buttons/XMLBrowser.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,9 @@ sub gotOPML {
);

}
elsif ( $item->{'type'} && $item->{'type'} eq 'header' ) {
$client->bumpRight();
}
elsif ( Slim::Control::XMLBrowser::hasDescription($item) ) {

displayItemDescription($client, $item, $opml);
Expand Down Expand Up @@ -977,6 +980,9 @@ sub overlaySymbol {
elsif ( Slim::Control::XMLBrowser::hasAudio($item) ) {
$overlay = $client->symbols('notesymbol');
}
elsif ( $item->{type} && $item->{type} eq 'header' ) {
$overlay = $client->symbols('rightarrow') if exists $item->{items};
Copy link
Member

@michaelherger michaelherger Feb 9, 2026

Choose a reason for hiding this comment

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

Would a header have items? I guess that's the same comment as before: you said a header would never have items. Why keep the option to show the arrow in that not to be expected situation?

Copy link
Author

@Sveninndh Sveninndh Feb 9, 2026

Choose a reason for hiding this comment

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

A header can contain items or an URL (function pointer) or neither.

}
elsif ( !$item->{type} || $item->{type} ne 'text' ) {
$overlay = $client->symbols('rightarrow');
}
Expand Down
2 changes: 1 addition & 1 deletion Slim/Control/XMLBrowser.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ sub _cliQuery_done {
$hasImage = 1;
}

if ( $item->{type} && $item->{type} eq 'text' && !$item->{wrap} && !$item->{jive} ) {
if ( $item->{type} && ( ($item->{type} eq 'text' && !$item->{wrap} && !$item->{jive}) || ($item->{type} eq 'header' && !$item->{items} && !$item->{url}) ) ) {
Copy link
Member

@michaelherger michaelherger Feb 7, 2026

Choose a reason for hiding this comment

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

Under what circumstances would a header item have items and a URL?

Copy link
Author

@Sveninndh Sveninndh Feb 8, 2026

Choose a reason for hiding this comment

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

I am not aware of any. I suspect you overlooked the ‘!’.
The condition ‘no action’ for ‘header’ is true if there are no items and no url.

Copy link
Member

@michaelherger michaelherger Feb 9, 2026

Choose a reason for hiding this comment

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

No, the exclusion is why I'm asking: why add that condition if it is expected to always be true? Seems to be just noise, rendering the condition difficult to read?

Copy link
Author

@Sveninndh Sveninndh Feb 9, 2026

Choose a reason for hiding this comment

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

A header can contain items or an URL (function pointer) or neither.

$hash{'style'} ||= 'itemNoAction';
$hash{'action'} = 'none';
}
Expand Down