mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-02 03:28:28 -04:00
fix(dankdash): update tabIndex reordering for media & weather widgets
- Fixes #2762
This commit is contained in:
@@ -1129,12 +1129,13 @@ Item {
|
||||
parentScreen: barWindow.screen
|
||||
onClicked: {
|
||||
const section = topBarContent.getWidgetSection(parent) || "center";
|
||||
const tabIndex = SettingsData.dashTabIndexForId("media");
|
||||
topBarContent.openWidgetPopout({
|
||||
loader: dankDashPopoutLoader,
|
||||
widgetItem: mediaWidget,
|
||||
section,
|
||||
tabIndex: 1,
|
||||
triggerSource: topBarContent._dashTriggerSource(section, 1),
|
||||
tabIndex,
|
||||
triggerSource: topBarContent._dashTriggerSource(section, tabIndex),
|
||||
mode: "click",
|
||||
useCenterSection: true,
|
||||
setTriggerScreen: true
|
||||
@@ -1156,12 +1157,13 @@ Item {
|
||||
parentScreen: barWindow.screen
|
||||
onClicked: {
|
||||
const section = topBarContent.getWidgetSection(parent) || "center";
|
||||
const tabIndex = SettingsData.dashTabIndexForId("weather");
|
||||
topBarContent.openWidgetPopout({
|
||||
loader: dankDashPopoutLoader,
|
||||
widgetItem: weatherWidget,
|
||||
section,
|
||||
tabIndex: 3,
|
||||
triggerSource: topBarContent._dashTriggerSource(section, 3),
|
||||
tabIndex,
|
||||
triggerSource: topBarContent._dashTriggerSource(section, tabIndex),
|
||||
mode: "click",
|
||||
useCenterSection: true,
|
||||
setTriggerScreen: true
|
||||
|
||||
@@ -736,7 +736,7 @@ Item {
|
||||
case "music":
|
||||
case "weather":
|
||||
{
|
||||
const tabIndex = widgetId === "clock" ? 0 : (widgetId === "music" ? 1 : 3);
|
||||
const tabIndex = widgetId === "clock" ? 0 : SettingsData.dashTabIndexForId(widgetId === "music" ? "media" : "weather");
|
||||
return barContent.openWidgetPopout(Object.assign({}, base, {
|
||||
loader,
|
||||
tabIndex,
|
||||
|
||||
Reference in New Issue
Block a user