simplify PositionShortcuts client ability

work/spdx
Michail Vourlakos 4 years ago
parent 460ce35f6c
commit d9ac0f7c48

@ -1,5 +1,5 @@
/*
* Copyright 2020 Michail Vourlakos <mvourlakos@gmail.com>
* Copyright 2021 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
@ -19,12 +19,17 @@
import QtQuick 2.0
PositionShortcutsFunc {
import org.kde.latte.abilities.definition 0.1 as AbilityDefinition
AbilityDefinition.PositionShortcuts {
id: shortcuts
property Item bridge: null
property Item indexer: null
property bool isStealingGlobalPositionShortcuts: false
readonly property bool isActive: bridge !== null
readonly property bool showPositionShortcutBadges: bridge && bridge.shortcuts.host ? bridge.shortcuts.host.showPositionShortcutBadges : false
readonly property bool isEnabled: {
if (bridge) {
return bridge.shortcuts.host.unifiedGlobalShortcuts
@ -53,5 +58,16 @@ PositionShortcutsFunc {
bridge.shortcuts.client = null;
}
}
function shortcutIndex(entryIndex) {
if (!bridge || bridge.shortcuts.host.unifiedGlobalShortcuts) {
return indexer.visibleIndex(entryIndex);
}
var base = bridge.indexer.host.visibleIndex(bridge.shortcuts.appletIndex);
//!visible indexes start counting from 1
return (indexer.visibleIndex(entryIndex) - base + 1);
}
}

@ -1,41 +0,0 @@
/*
* 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.7
import org.kde.latte.abilities.definition 0.1 as AbilityDefinition
AbilityDefinition.PositionShortcuts {
id: shortcuts
property Item bridge: null
property Item indexer: null
readonly property bool isActive: bridge !== null
function shortcutIndex(entryIndex) {
if (!bridge || bridge.shortcuts.host.unifiedGlobalShortcuts) {
return indexer.visibleIndex(entryIndex);
}
var base = bridge.indexer.host.visibleIndex(bridge.shortcuts.appletIndex);
//!visible indexes start counting from 1
return (indexer.visibleIndex(entryIndex) - base + 1);
}
}
Loading…
Cancel
Save