kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-25 19:21:41 +03:00
Code Issues Projects Releases Wiki Activity

remove deprecated Tasks::ParabolicManager

Browse Source
This commit is contained in:
Michail Vourlakos 2020-05-23 01:17:59 +03:00
parent 9e0fa5d6cd
commit 9590dea430
5 changed files with 61 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plasmoid/package/contents/ui/ContextMenu.qml
View File

@ -892,7 +892,6 @@ PlasmaComponents.ContextMenu {
enabled: (root.indexer.separators.length > 0) && visualParent && visualParent.isSeparator
onClicked: {
//root.removeLastSeparator();
var launcher = get(atm.LauncherUrlWithoutIcon);
if (latteView && root.launchersGroup >= LatteCore.Types.LayoutLaunchers) {

264
plasmoid/package/contents/ui/ParabolicManager.qml
View File

@ -1,264 +0,0 @@
/*
* Copyright 2016 Smith AR <audoban@openmailbox.org>
* Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import org.kde.plasma.plasmoid 2.0
// holds all the logic around parabolic effect signals into one place.
// ParabolicManager is responsible for triggering all the messages to tasks
// that are neighbour to the hovered task. This will help a lot to catch cases
// such as separators and proper clearing zoom.
Item {
id: parManager
property bool hasInternalSeparator: false
property int firstRealTaskIndex: -1
property int lastRealTaskIndex: -1
property int countRealTasks: -1
Connections{
target: root
onTasksCountChanged: parManager.updateTasksEdgesIndexes();
onHiddenTasksUpdated: parManager.updateTasksEdgesIndexes();
}
Component.onCompleted: {
updateHasInternalSeparator();
updateTasksEdgesIndexes();
}
function updateTasksEdgesIndexes() {
var newFirstTask = firstRealTask();
var newLastTask = lastRealTask();
if (newFirstTask !== firstRealTaskIndex || newLastTask !== lastRealTaskIndex ){
firstRealTaskIndex = newFirstTask;
lastRealTaskIndex = newLastTask;
}
countRealTasks = realTasks();
}
function updateHasInternalSeparator() {
var count = icList.contentItem.children.length;
for (var i=0; i<count; ++i) {
var task = icList.childAtIndex(i);
if (task && task.isSeparator){
hasInternalSeparator = true;
return;
}
}
hasInternalSeparator = false;
}
function neighbourIsHovered(index) {
if (parManager.lastIndex<0)
return;
if (Math.abs(index - parManager.lastIndex)<=1)
return true;
return false;
}
function availableLowerIndex(from) {
var next = from;
while (next>=0
&& (taskIsSeparator(next) || (root.showWindowsOnlyFromLaunchers && taskIsForcedHidden(next))) )
next = next - 1;
return next;
}
function availableHigherIndex(from) {
var next = from;
while (next<=root.tasksCount-1
&& (taskIsSeparator(next) || (root.showWindowsOnlyFromLaunchers && taskIsForcedHidden(next))) ) {
next = next + 1;
}
return next;
}
function isSeparator(launcher){
return (launcher.indexOf("latte-separator")!==-1 && launcher.indexOf(".desktop")!==1);
}
function taskIsSeparator(taskIndex){
var task = icList.childAtIndex(taskIndex);
return (task && !task.isForcedHidden && task.isSeparator);
}
function taskIsForcedHidden(taskIndex) {
var task = icList.childAtIndex(taskIndex);
//!tasks that become hidden there is a chance to have index===-1 and to not be
//!able to be tracked down
return ((!task && (taskIndex>=0 && taskIndex<tasksModel.count)) || task.isForcedHidden);
}
function separatorExists(separator){
return (tasksModel.launcherPosition(separator)>=0);
}
//! the real index task after we take into account the separators before it
//! for example the first task if there is a separator before it is 1, it isnt 0
function realTaskIndex(pseudoIndex) {
if (hasInternalSeparator) {
var steps = pseudoIndex + 1;
var pos = 0;
while (steps > 0) {
if (!taskIsSeparator(pos)) {
steps = steps - 1;
}
if (steps > 0)
pos = pos + 1;
}
return pos;
} else {
return pseudoIndex;
}
}
//! the pseudo index task after we take into account the separators before it
//! for example the third task if there is a separator before it is 1, it isnt 2
function pseudoTaskIndex(realIndex) {
var pseudoIndex = realIndex;
if (hasInternalSeparator) {
for (var i=0; i<realIndex; i++){
if (taskIsSeparator(i)) {
pseudoIndex = pseudoIndex-1;
}
}
}
return pseudoIndex + root.tasksBaseIndex;
}
//! first available task index found after consequent internal separators or hidden tasks in the start
function firstRealTask() {
if (hasInternalSeparator) {
var i=0;
while (i<=root.tasksCount-1) {
if (!taskIsSeparator(i) && !taskIsForcedHidden(i)) {
return i;
}
i = i + 1;
}
}
return root.tasksCount > 0 ? 0 : -1;
}
//! last available task index found after consequent internal separators in the end
function lastRealTask() {
if (hasInternalSeparator || root.showWindowsOnlyFromLaunchers) {
var i = tasksModel.count - 1;
while (i>=0) {
if (!taskIsSeparator(i) && !taskIsForcedHidden(i) ) {
return i;
}
i = i - 1;
}
}
return root.tasksCount > 0 ? root.tasksCount-1 : -1;
}
//! the real number of tasks if we remove the internal separators and hidden windows in the end
function realTasks() {
var space = lastRealTaskIndex - firstRealTaskIndex;
if (space >= 0) {
var ignored = 0;
for(var i=firstRealTaskIndex; i<lastRealTaskIndex; ++i) {
if (taskIsSeparator(i) || taskIsForcedHidden(i)) {
ignored = ignored + 1;
}
}
return space + 1 - ignored;
}
return 0;
}
function freeAvailableSeparatorName() {
var available = false;
var no = 1;
var separatorName = "";
while(!available && no
<20) {
separatorName = "file:///latte-separator"+no+".desktop";
if (separatorExists(separatorName)) {
no = no + 1;
} else {
available = true;
}
}
if (available) {
return separatorName;
} else {
return "";
}
}
function lastPresentSeparatorName() {
var max = -1;
var arrayPos = -1;
var sLength = separators.length;
for (var i=0; i<sLength; ++i) {
//!safety checker
if (i>=separators.length)
return false;
if (separators[i].index > max) {
max = separators[i].index;
arrayPos = i;
}
}
if (arrayPos>-1)
return separators[arrayPos].launcherUrl;
else
return "";
}
}

52
plasmoid/package/contents/ui/abilities/Launchers.qml Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright 2020 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
Item {
function isSeparator(launcher){
return (launcher.indexOf("latte-separator")!==-1 && launcher.indexOf(".desktop")!==1);
}
function separatorExists(separator){
return (tasksModel.launcherPosition(separator)>=0);
}
function freeAvailableSeparatorName() {
var available = false;
var no = 1;
var separatorName = "";
while(!available && no<20) {
separatorName = "file:///latte-separator"+no+".desktop";
if (separatorExists(separatorName)) {
no = no + 1;
} else {
available = true;
}
}
if (available) {
return separatorName;
} else {
return "";
}
}
}

22
plasmoid/package/contents/ui/main.qml
View File

@ -135,6 +135,7 @@ Item {
property Item tasksExtendedManager: _tasksExtendedManager
readonly property alias animations: _animations
readonly property alias indexer: _indexer
readonly property alias launchers: _launchers
readonly property alias metrics: _metrics
readonly property alias parabolic: _parabolic
readonly property alias shortcuts: _shortcuts
@ -948,6 +949,10 @@ Item {
allItemsCount: tasksModel.count
}
Ability.Launchers {
id: _launchers
}
Ability.Metrics {
id: _metrics
bridge: latteBridge
@ -1262,6 +1267,7 @@ Item {
delegate: Task.TaskItem{
animations: _animations
indexer: _indexer
launchers: _launchers
metrics: _metrics
parabolic: _parabolic
requires: _requires
@ -1622,7 +1628,7 @@ Item {
//// functions
function addInternalSeparatorAtPos(pos) {
var separatorName = parabolicManager.freeAvailableSeparatorName();
var separatorName = launchers.freeAvailableSeparatorName();
if (separatorName !== "") {
tasksExtendedManager.addLauncherToBeMoved(separatorName, Math.max(0,pos));
@ -1767,20 +1773,6 @@ Item {
}
}
function removeLastSeparator(){
var separatorName = parabolicManager.lastPresentSeparatorName();
if (separatorName !== "") {
if (latteView && root.launchersGroup >= LatteCore.Types.LayoutLaunchers) {
latteView.layoutsManager.launchersSignals.removeLauncher(root.viewLayoutName,
root.launchersGroup, separatorName);
} else {
root.launcherForRemoval = separatorName;
tasksModel.requestRemoveLauncher(separatorName);
}
}
}
function previewContainsMouse() {
return windowsPreviewDlg.containsMouse;
}

7
plasmoid/package/contents/ui/task/TaskItem.qml
View File

@ -183,6 +183,7 @@ MouseArea{
//abilities
property Item animations: null
property Item indexer: null
property Item launchers: null
property Item metrics: null
property Item parabolic: null
property Item requires: null
@ -205,7 +206,7 @@ MouseArea{
}
}
if (parabolicManager.isSeparator(modelLauncherUrl)){
if (launchers.isSeparator(modelLauncherUrl)){
isSeparator = true;
} else {
isSeparator = false;
@ -1666,10 +1667,6 @@ MouseArea{
onTriggered: {
if (taskItem.itemIndex >= 0){
taskItem.lastValidIndex = taskItem.itemIndex;
if (root.showWindowsOnlyFromLaunchers) {
parabolicManager.updateTasksEdgesIndexes();
}
}
if (latteView && latteView.debugModeTimers) {