mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-07-31 00:34:45 +00:00
taskswitcher: fix incorrect enum access & remove long broken logic in QML
This commit is contained in:
parent
b41a80466a
commit
1fa16ee491
1 changed files with 1 additions and 10 deletions
|
|
@ -199,7 +199,7 @@ FocusScope {
|
||||||
// setup some values and return to the initial setup so that the user can always navigate with no down time
|
// setup some values and return to the initial setup so that the user can always navigate with no down time
|
||||||
root.state.wasInActiveTask = root.taskSwitcherHelpers.openAppAnim.running ? true : false
|
root.state.wasInActiveTask = root.taskSwitcherHelpers.openAppAnim.running ? true : false
|
||||||
taskList.setTaskOffsetValue(root.state.wasInActiveTask ? root.taskSwitcherHelpers.taskOffsetValue : root.taskSwitcherHelpers.homeOffsetValue, true);
|
taskList.setTaskOffsetValue(root.state.wasInActiveTask ? root.taskSwitcherHelpers.taskOffsetValue : root.taskSwitcherHelpers.homeOffsetValue, true);
|
||||||
root.state.status = !root.state.wasInActiveTask ? (root.taskSwitcherHelpers.openAppAnim.closeAnim && !root.taskSwitcherHelpers.taskDrawerWillOpen ? TaskSwitcherPlugin.TaskSwitcherState.Active : TaskSwitcherPlugin.TaskSwitcherState.Inactive) : TaskSwitcherPlugin.TaskSwitcherState.Inactive
|
root.state.status = !root.state.wasInActiveTask ? (root.taskSwitcherHelpers.openAppAnim.closeAnim && !root.taskSwitcherHelpers.taskDrawerWillOpen ? TaskSwitcherPlugin.MobileTaskSwitcherState.Active : TaskSwitcherPlugin.MobileTaskSwitcherState.Inactive) : TaskSwitcherPlugin.MobileTaskSwitcherState.Inactive
|
||||||
root.initialSetup();
|
root.initialSetup();
|
||||||
} else if (root.taskSwitcherHelpers.openAnim.running) {
|
} else if (root.taskSwitcherHelpers.openAnim.running) {
|
||||||
root.taskSwitcherHelpers.cancelAnimations();
|
root.taskSwitcherHelpers.cancelAnimations();
|
||||||
|
|
@ -732,15 +732,6 @@ FocusScope {
|
||||||
shellTopMargin: root.topMargin
|
shellTopMargin: root.topMargin
|
||||||
shellBottomMargin: root.bottomMargin
|
shellBottomMargin: root.bottomMargin
|
||||||
|
|
||||||
opacity: {
|
|
||||||
// animate opacity only if we are *not* opening from the homescreen
|
|
||||||
// TODO! do we really not want to animate it always? it's a bit harsh to look at when opening from homescreen
|
|
||||||
if (root.state.wasInActiveTask || !root.state.currentlyBeingOpened) {
|
|
||||||
return 1;
|
|
||||||
} else {
|
|
||||||
return Math.min(1, root.state.yPosition / root.state.openedYPosition);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
x: flickable.contentX
|
x: flickable.contentX
|
||||||
width: flickable.width
|
width: flickable.width
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue