mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-02 11:38:30 -04:00
fix(dash-tabs): update visibility logic for dash tab elements
Fixes #2822
Port 1.5
(cherry picked from commit f590a2965a)
This commit is contained in:
@@ -323,7 +323,8 @@ DankPopout {
|
||||
id: tabBar
|
||||
|
||||
width: parent.width
|
||||
height: 48
|
||||
height: visible ? 48 : 0
|
||||
visible: model.length > 0
|
||||
currentIndex: root.currentTabIndex
|
||||
spacing: Theme.spacingS
|
||||
equalWidthTabs: true
|
||||
@@ -355,7 +356,8 @@ DankPopout {
|
||||
|
||||
Item {
|
||||
width: parent.width
|
||||
height: Theme.spacingXS
|
||||
height: visible ? Theme.spacingXS : 0
|
||||
visible: tabBar.visible
|
||||
}
|
||||
|
||||
Item {
|
||||
|
||||
@@ -48,7 +48,7 @@ Item {
|
||||
// its delegates alive across commits (preserving focus for keyboard reorder)
|
||||
readonly property var tabIds: SettingsData._dashTabIds
|
||||
readonly property var tabState: SettingsData.getDashTabs()
|
||||
readonly property int enabledContentCount: tabState.filter(t => t.enabled && t.id !== "settings").length
|
||||
readonly property var visibleContentIds: SettingsData.visibleDashTabIds().filter(id => id !== "settings")
|
||||
|
||||
function presentationFor(id) {
|
||||
return __presentation[id] ?? {
|
||||
@@ -149,7 +149,7 @@ Item {
|
||||
}
|
||||
|
||||
function canHide(id) {
|
||||
return !isEnabled(id) || id === "settings" || enabledContentCount > 1;
|
||||
return !isEnabled(id) || id === "settings" || visibleContentIds.indexOf(id) < 0 || visibleContentIds.length > 1;
|
||||
}
|
||||
|
||||
// Keyboard nav is handled at the tab root (not per-row activeFocusOnTab)
|
||||
|
||||
Reference in New Issue
Block a user