github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

support a meta badge visual from global shortcuts

Browse Source 
--when an application launcher exists, Latte can show
a "Meta" badge for that applet instead of the global
shortcut action number. With this patch we take also
into account when the assigned application launcher is
in different dock/panel and show it accordingly

BUG: 396753
pull/2/head
Michail Vourlakos 7 years ago
parent 265383ce34
commit 6708510213
8 changed files with 307 additions and 116 deletions
Show Stats Download Patch File Download Diff File

325
app/globalshortcuts.cpp
Unescape Escape View File

@ -21,6 +21,7 @@
#include "dockcorona.h"
#include "globalshortcuts.h"
#include "layoutmanager.h"
#include "universalsettings.h"
#include "dock/dockview.h"
#include <QAction>
@ -152,18 +153,18 @@ GlobalShortcuts::GlobalShortcuts(QObject *parent)
init();
}
m_hideDockTimer.setSingleShot(true);
m_hideDocksTimer.setSingleShot(true);
if (isPlatformX11()) {
//in X11 the timer is a poller that checks to see if the modifier keys
//from user global shortcut have been released
m_hideDockTimer.setInterval(300);
m_hideDocksTimer.setInterval(300);
} else {
//on wayland in acting just as simple timer that hides the dock afterwards
m_hideDockTimer.setInterval(2500);
m_hideDocksTimer.setInterval(2500);
}
connect(&m_hideDockTimer, &QTimer::timeout, this, &GlobalShortcuts::hideDockTimerSlot);
connect(&m_hideDocksTimer, &QTimer::timeout, this, &GlobalShortcuts::hideDocksTimerSlot);
}
GlobalShortcuts::~GlobalShortcuts()
@ -180,7 +181,7 @@ void GlobalShortcuts::init()
showAction->setShortcut(QKeySequence(Qt::META + '`'));
KGlobalAccel::setGlobalShortcut(showAction, QKeySequence(Qt::META + '`'));
connect(showAction, &QAction::triggered, this, [this]() {
showDock();
showDocks();
});
//show-cycle between Latte settings windows
@ -271,27 +272,29 @@ void GlobalShortcuts::init()
//! Activate launcher menu through dbus interface
void GlobalShortcuts::activateLauncherMenu()
{
QHash<const Plasma::Containment *, DockView *> *views = m_corona->layoutManager()->currentDockViews();
QList<DockView *> sortedViews = sortedViewsList(m_corona->layoutManager()->currentDockViews());
for (auto it = views->constBegin(), end = views->constEnd(); it != end; ++it) {
const auto applets = it.key()->applets();
foreach (auto view, sortedViews) {
const auto applets = view->containment()->applets();
for (auto applet : applets) {
const auto provides = applet->kPackage().metadata().value(QStringLiteral("X-Plasma-Provides"));
if (provides.contains(QLatin1String("org.kde.plasma.launchermenu"))) {
if (it.value()->visibility()->isHidden()) {
if (view->visibility()->isHidden()) {
m_lastInvokedAction = m_singleMetaAction;
m_hideDock = it.value();
m_hideDock->visibility()->setBlockHiding(true);
m_hideDockTimer.start();
m_hideDocks.clear();
m_hideDocks.append(view);
view->visibility()->setBlockHiding(true);
m_hideDocksTimer.start();
//! delay the execution in order to show first the dock
QTimer::singleShot(APPLETEXECUTIONDELAY, [this, it, applet]() {
it.value()->toggleAppletExpanded(applet->id());
QTimer::singleShot(APPLETEXECUTIONDELAY, [this, view, applet]() {
view->toggleAppletExpanded(applet->id());
});
} else {
it.value()->toggleAppletExpanded(applet->id());
view->toggleAppletExpanded(applet->id());
}
return;
@ -334,15 +337,14 @@ bool GlobalShortcuts::activatePlasmaTaskManagerEntryAtContainment(const Plasma::
continue;
}
m_calledItem = item;
m_numbersMethodIndex = methodIndex;
m_methodShowNumbers = metaObject->method(m_numbersMethodIndex);
m_calledItems.append(item);
m_methodsShowNumbers.append(metaObject->method(methodIndex));
QMetaMethod method = metaObject->method(methodIndex);
if (method.invoke(item, Q_ARG(QVariant, index - 1))) {
if (methodIndex2 != -1) {
m_methodShowNumbers.invoke(item, Q_ARG(QVariant, true));
m_methodsShowNumbers[m_methodsShowNumbers.count() - 1].invoke(item, Q_ARG(QVariant, true));
}
return true;
@ -372,21 +374,24 @@ bool GlobalShortcuts::activateLatteEntryAtContainment(const DockView *view, int
metaObject->indexOfMethod("activateEntryAtIndex(QVariant)") :
metaObject->indexOfMethod("newInstanceForEntryAtIndex(QVariant)");
int methodIndex2 = metaObject->indexOfMethod("setShowAppletsNumbers(QVariant)");
int methodIndex2 = metaObject->indexOfMethod("setShowAppletsNumbers(QVariant,QVariant,QVariant)");
if (methodIndex == -1 || (methodIndex2 == -1)) {
continue;
}
m_calledItem = item;
m_numbersMethodIndex = methodIndex2;
m_methodShowNumbers = metaObject->method(m_numbersMethodIndex);
int appLauncher = m_corona->universalSettings()->metaForwardedToLatte() ?
applicationLauncherId(view->containment()) : -1;
m_calledItems.append(item);
m_methodsShowNumbers.append(metaObject->method(methodIndex2));
int lastMethod = m_methodsShowNumbers.count() - 1;
QMetaMethod method = metaObject->method(methodIndex);
if (view->visibility()->isHidden()) {
//! delay the execution in order to show first the dock
if (m_methodShowNumbers.invoke(item, Q_ARG(QVariant, true))) {
if (m_methodsShowNumbers[lastMethod].invoke(item, Q_ARG(QVariant, true), Q_ARG(QVariant, true), Q_ARG(QVariant, appLauncher))) {
QTimer::singleShot(APPLETEXECUTIONDELAY, [this, item, method, index]() {
method.invoke(item, Q_ARG(QVariant, index));
});
@ -395,7 +400,7 @@ bool GlobalShortcuts::activateLatteEntryAtContainment(const DockView *view, int
return true;
} else {
if (method.invoke(item, Q_ARG(QVariant, index))) {
m_methodShowNumbers.invoke(item, Q_ARG(QVariant, true));
m_methodsShowNumbers[lastMethod].invoke(item, Q_ARG(QVariant, true), Q_ARG(QVariant, true), Q_ARG(QVariant, appLauncher));
return true;
}
@ -413,33 +418,19 @@ void GlobalShortcuts::activateEntry(int index, Qt::Key modifier)
{
m_lastInvokedAction = dynamic_cast<QAction *>(sender());
QHash<const Plasma::Containment *, DockView *> *views = m_corona->layoutManager()->currentDockViews();
QList<DockView *> sortedViews = sortedViewsList(m_corona->layoutManager()->currentDockViews());
// To avoid overly complex configuration, we'll try to get the 90% usecase to work
// which is activating a task on the task manager on a panel on the primary screen.
for (auto it = views->constBegin(), end = views->constEnd(); it != end; ++it) {
if (it.value()->screen() != qGuiApp->primaryScreen()) {
continue;
}
m_calledItems.clear();
m_methodsShowNumbers.clear();
if ((it.value()->latteTasksPresent() && activateLatteEntryAtContainment(it.value(), index, modifier))
|| (!it.value()->latteTasksPresent() && it.value()->tasksPresent() &&
activatePlasmaTaskManagerEntryAtContainment(it.key(), index, modifier))) {
m_hideDock = it.value();
m_hideDock->visibility()->setBlockHiding(true);
m_hideDockTimer.start();
return;
}
}
// we didn't find anything on primary, try all the panels
for (auto it = views->constBegin(), end = views->constEnd(); it != end; ++it) {
if ((it.value()->latteTasksPresent() && activateLatteEntryAtContainment(it.value(), index, modifier))
|| (!it.value()->latteTasksPresent() && it.value()->tasksPresent() &&
activatePlasmaTaskManagerEntryAtContainment(it.key(), index, modifier))) {
m_hideDock = it.value();
m_hideDock->visibility()->setBlockHiding(true);
m_hideDockTimer.start();
foreach (auto view, sortedViews) {
if ((view->latteTasksPresent() && activateLatteEntryAtContainment(view, index, modifier))
|| (!view->latteTasksPresent() && view->tasksPresent() &&
activatePlasmaTaskManagerEntryAtContainment(view->containment(), index, modifier))) {
m_hideDocks.clear();
m_hideDocks.append(view);
view->visibility()->setBlockHiding(true);
m_hideDocksTimer.start();
return;
}
}
@ -499,7 +490,48 @@ void GlobalShortcuts::updateDockItemBadge(QString identifier, QString value)
}
}
void GlobalShortcuts::showDock()
bool GlobalShortcuts::isCapableToShowAppletsNumbers(const Plasma::Containment *c)
{
if (QQuickItem *containmentInterface = c->property("_plasma_graphicObject").value<QQuickItem *>()) {
const auto &childItems = containmentInterface->childItems();
for (QQuickItem *item : childItems) {
if (auto *metaObject = item->metaObject()) {
// not using QMetaObject::invokeMethod to avoid warnings when calling
// this on applets that don't have it or other child items since this
// is pretty much trial and error.
// Also, "var" arguments are treated as QVariant in QMetaObject
int methodIndex = metaObject->indexOfMethod("setShowAppletsNumbers(QVariant,QVariant,QVariant)");
if (methodIndex == -1) {
continue;
}
return true;
}
}
}
return false;
}
int GlobalShortcuts::applicationLauncherId(const Plasma::Containment *c)
{
const auto applets = c->applets();
for (auto applet : applets) {
const auto provides = applet->kPackage().metadata().value(QStringLiteral("X-Plasma-Provides"));
if (provides.contains(QLatin1String("org.kde.plasma.launchermenu"))) {
return applet->id();
}
}
return -1;
}
void GlobalShortcuts::showDocks()
{
m_lastInvokedAction = dynamic_cast<QAction *>(sender());
@ -514,17 +546,20 @@ void GlobalShortcuts::showDock()
// is pretty much trial and error.
// Also, "var" arguments are treated as QVariant in QMetaObject
int methodIndex = metaObject->indexOfMethod("setShowAppletsNumbers(QVariant)");
int methodIndex = metaObject->indexOfMethod("setShowAppletsNumbers(QVariant,QVariant,QVariant)");
if (methodIndex == -1) {
continue;
}
m_calledItem = item;
m_numbersMethodIndex = methodIndex;
m_methodShowNumbers = metaObject->method(m_numbersMethodIndex);
int appLauncher = m_corona->universalSettings()->metaForwardedToLatte() ?
applicationLauncherId(c) : -1;
if (m_methodShowNumbers.invoke(item, Q_ARG(QVariant, true))) {
m_calledItems.append(item);
m_methodsShowNumbers.append(metaObject->method(methodIndex));
int lastMethod = m_methodsShowNumbers.count() - 1;
if (m_methodsShowNumbers[lastMethod].invoke(item, Q_ARG(QVariant, true), Q_ARG(QVariant, true), Q_ARG(QVariant, appLauncher))) {
return true;
}
}
@ -534,46 +569,106 @@ void GlobalShortcuts::showDock()
return false;
};
QHash<const Plasma::Containment *, DockView *> *views = m_corona->layoutManager()->currentDockViews();
auto invokeShowOnlyMeta = [this](const Plasma::Containment * c) {
if (QQuickItem *containmentInterface = c->property("_plasma_graphicObject").value<QQuickItem *>()) {
const auto &childItems = containmentInterface->childItems();
// To avoid overly complex configuration, we'll try to get the 90% usecase to work
// which is activating a task on the task manager on a panel on the primary screen.
for (auto it = views->constBegin(), end = views->constEnd(); it != end; ++it) {
if (it.value()->screen() != qGuiApp->primaryScreen()) {
continue;
}
for (QQuickItem *item : childItems) {
if (auto *metaObject = item->metaObject()) {
// not using QMetaObject::invokeMethod to avoid warnings when calling
// this on applets that don't have it or other child items since this
// is pretty much trial and error.
if (it.value()->latteTasksPresent() && invokeShowNumbers(it.key())) {
if (!m_hideDockTimer.isActive()) {
m_hideDock = it.value();
m_hideDock->visibility()->setBlockHiding(true);
m_hideDockTimer.start();
} else {
m_hideDockTimer.stop();
hideDockTimerSlot();
// Also, "var" arguments are treated as QVariant in QMetaObject
int methodIndex = metaObject->indexOfMethod("setShowAppletsNumbers(QVariant,QVariant,QVariant)");
if (methodIndex == -1) {
continue;
}
int appLauncher = m_corona->universalSettings()->metaForwardedToLatte() ?
applicationLauncherId(c) : -1;
m_calledItems.append(item);
m_methodsShowNumbers.append(metaObject->method(methodIndex));
int lastMethod = m_methodsShowNumbers.count() - 1;
if (m_methodsShowNumbers[lastMethod].invoke(item, Q_ARG(QVariant, false), Q_ARG(QVariant, true), Q_ARG(QVariant, appLauncher))) {
return true;
}
}
}
}
return;
return false;
};
QList<DockView *> sortedViews = sortedViewsList(m_corona->layoutManager()->currentDockViews());
DockView *viewWithTasks{nullptr};
DockView *viewWithMeta{nullptr};
foreach (auto view, sortedViews) {
if (!viewWithTasks && isCapableToShowAppletsNumbers(view->containment())) {
viewWithTasks = view;
}
if (!viewWithMeta && m_corona->universalSettings()->metaForwardedToLatte() && applicationLauncherId(view->containment()) > -1) {
viewWithMeta = view;
}
}
// we didn't find anything on primary, try all the panels
for (auto it = views->constBegin(), end = views->constEnd(); it != end; ++it) {
if (it.value()->latteTasksPresent() && invokeShowNumbers(it.key())) {
if (!m_hideDockTimer.isActive()) {
m_hideDock = it.value();
m_hideDock->visibility()->setBlockHiding(true);
m_hideDockTimer.start();
} else {
m_hideDockTimer.stop();
hideDockTimerSlot();
}
bool dockFound{false};
return;
if (!m_hideDocksTimer.isActive()) {
m_hideDocks.clear();
}
if (viewWithTasks || viewWithMeta) {
m_calledItems.clear();
m_methodsShowNumbers.clear();
}
if (viewWithTasks && invokeShowNumbers(viewWithTasks->containment())) {
dockFound = true;
if (!m_hideDocksTimer.isActive()) {
m_hideDocks.append(viewWithTasks);
viewWithTasks->visibility()->setBlockHiding(true);
}
}
if (viewWithMeta && viewWithMeta != viewWithTasks && invokeShowOnlyMeta(viewWithMeta->containment())) {
dockFound = true;
if (!m_hideDocksTimer.isActive()) {
m_hideDocks.append(viewWithMeta);
viewWithMeta->visibility()->setBlockHiding(true);
}
}
if (dockFound) {
if (!m_hideDocksTimer.isActive()) {
m_hideDocksTimer.start();
} else {
m_hideDocksTimer.stop();
hideDocksTimerSlot();
}
}
}
bool GlobalShortcuts::docksToHideAreValid()
{
foreach (auto view, m_hideDocks) {
if (!m_corona->layoutManager()->dockViewExists(view)) {
return false;
}
}
return true;
}
bool GlobalShortcuts::dockAtLowerScreenPriority(DockView *test, DockView *base)
{
if (!base || ! test) {
@ -641,11 +736,11 @@ bool GlobalShortcuts::dockAtLowerEdgePriority(DockView *test, DockView *base)
}
void GlobalShortcuts::showSettings()
QList<DockView *> GlobalShortcuts::sortedViewsList(QHash<const Plasma::Containment *, DockView *> *views)
{
QList<DockView *> docks;
QHash<const Plasma::Containment *, DockView *> *views = m_corona->layoutManager()->currentDockViews();
//QHash<const Plasma::Containment *, DockView *> *views = m_corona->layoutManager()->currentDockViews();
//! create a docks list to sorted out
for (auto it = views->constBegin(), end = views->constEnd(); it != end; ++it) {
@ -680,6 +775,12 @@ void GlobalShortcuts::showSettings()
qDebug() << i << ". " << docks[i]->screen()->name() << " - " << docks[i]->location();
}
return docks;
}
void GlobalShortcuts::showSettings()
{
QList<DockView *> docks = sortedViewsList(m_corona->layoutManager()->currentDockViews());
//! find which is the next dock to show its settings
if (docks.count() > 0) {
@ -707,38 +808,60 @@ void GlobalShortcuts::showSettings()
}
}
void GlobalShortcuts::hideDockTimerSlot()
void GlobalShortcuts::hideDocksTimerSlot()
{
if (!m_lastInvokedAction || !m_hideDock) {
if (!m_lastInvokedAction || m_hideDocks.count() == 0) {
return;
}
if (isPlatformX11()) {
if (!x11_areModKeysDepressed(m_lastInvokedAction->shortcut())) {
m_lastInvokedAction = Q_NULLPTR;
m_hideDock->visibility()->setBlockHiding(false);
m_hideDock = Q_NULLPTR;
if (m_calledItem) {
m_methodShowNumbers.invoke(m_calledItem, Q_ARG(QVariant, false));
m_calledItem = Q_NULLPTR;
m_numbersMethodIndex = -1;
if (docksToHideAreValid()) {
foreach (auto dockView, m_hideDocks) {
dockView->visibility()->setBlockHiding(false);
}
m_hideDocks.clear();
if (m_calledItems.count() > 0) {
for (int i = 0; i < m_calledItems.count(); ++i) {
m_methodsShowNumbers[i].invoke(m_calledItems[i], Q_ARG(QVariant, false), Q_ARG(QVariant, false), Q_ARG(QVariant, -1));
}
m_calledItems.clear();
}
} else {
m_hideDocks.clear();
m_calledItems.clear();
}
return;
}
m_hideDockTimer.start();
m_hideDocksTimer.start();
} else {
// TODO: This is needs to be fixed in wayland
m_lastInvokedAction = Q_NULLPTR;
m_hideDock->visibility()->setBlockHiding(false);
m_hideDock = Q_NULLPTR;
if (m_calledItem) {
m_methodShowNumbers.invoke(m_calledItem, Q_ARG(QVariant, false));
m_calledItem = Q_NULLPTR;
m_numbersMethodIndex = -1;
if (docksToHideAreValid()) {
foreach (auto dockView, m_hideDocks) {
dockView->visibility()->setBlockHiding(false);
}
m_hideDocks.clear();
if (m_calledItems.count() > 0) {
for (int i = 0; i < m_calledItems.count(); ++i) {
m_methodsShowNumbers[i].invoke(m_calledItems[i], Q_ARG(QVariant, false), Q_ARG(QVariant, false), Q_ARG(QVariant, -1));
}
m_calledItems.clear();
}
} else {
m_hideDocks.clear();
m_calledItems.clear();
}
}

24
app/globalshortcuts.h
Unescape Escape View File

@ -27,6 +27,10 @@
#include <QMetaMethod>
#include <QTimer>
namespace Plasma {
class Containment;
}
namespace Latte {
class DockCorona;
class DockView;
@ -46,30 +50,34 @@ public:
void updateDockItemBadge(QString identifier, QString value);
private slots:
void hideDockTimerSlot();
void hideDocksTimerSlot();
private:
void init();
void activateEntry(int index, Qt::Key modifier);
void showDock();
void hideDock();
void showDocks();
void showSettings();
bool activateLatteEntryAtContainment(const DockView *view, int index, Qt::Key modifier);
bool activatePlasmaTaskManagerEntryAtContainment(const Plasma::Containment *c, int index, Qt::Key modifier);
bool dockAtLowerEdgePriority(DockView *test, DockView *base);
bool dockAtLowerScreenPriority(DockView *test, DockView *base);
bool docksToHideAreValid();
bool isCapableToShowAppletsNumbers(const Plasma::Containment *c);
int applicationLauncherId(const Plasma::Containment *c);
QList<DockView *> sortedViewsList(QHash<const Plasma::Containment *, DockView *> *views);
QAction *m_lastInvokedAction;
//!it is used when the dock is hidden in order to delay the app launcher showing
QAction *m_singleMetaAction;
QTimer m_hideDockTimer;
DockView *m_hideDock;
QTimer m_hideDocksTimer;
QList<DockView *> m_hideDocks;
int m_numbersMethodIndex{ -1};
QQuickItem *m_calledItem{nullptr};
QMetaMethod m_methodShowNumbers;
QList<QQuickItem *> m_calledItems;
QList<QMetaMethod> m_methodsShowNumbers;
DockCorona *m_corona{nullptr};
};

13
app/layoutmanager.cpp
Unescape Escape View File

@ -308,6 +308,19 @@ void LayoutManager::addDock(Plasma::Containment *containment, bool forceLoading,
}
}
bool LayoutManager::dockViewExists(DockView *view) const
{
foreach (auto layout, m_activeLayouts) {
for (auto it = layout->dockViews()->constBegin(), end = layout->dockViews()->constEnd(); it != end; ++it) {
if (it.value() == view) {
return true;
}
}
}
return false;
}
QHash<const Plasma::Containment *, DockView *> *LayoutManager::currentDockViews() const
{
if (memoryUsage() == Dock::SingleLayout) {

1
app/layoutmanager.h
Unescape Escape View File

@ -78,6 +78,7 @@ public:
void syncDockViewsToScreens();
void syncActiveLayoutsToOriginalFiles();
bool dockViewExists(DockView *view) const;
bool layoutExists(QString layoutName) const;
QString shouldSwitchToLayout(QString activityId);

23
app/universalsettings.cpp
Unescape Escape View File

@ -24,11 +24,14 @@
#include "sortedactivitiesmodel.h"
#include <QDir>
#include <QProcess>
#include <KActivities/Consumer>
namespace Latte {
const QString UniversalSettings::KWinMetaForwardToLatteString = "org.kde.lattedock,/Latte,org.kde.LatteDock,activateLauncherMenu";
UniversalSettings::UniversalSettings(KSharedConfig::Ptr config, QObject *parent)
: QObject(parent),
m_config(config),
@ -47,6 +50,8 @@ UniversalSettings::UniversalSettings(KSharedConfig::Ptr config, QObject *parent)
connect(this, &UniversalSettings::showInfoWindowChanged, this, &UniversalSettings::saveConfig);
connect(this, &UniversalSettings::unifiedGlobalShortcutsChanged, this, &UniversalSettings::saveConfig);
connect(this, &UniversalSettings::versionChanged, this, &UniversalSettings::saveConfig);
m_metaForwardedToLatte = kwin_metaForwardedToLatte();
}
UniversalSettings::~UniversalSettings()
@ -278,6 +283,24 @@ void UniversalSettings::setCanDisableBorders(bool enable)
emit canDisableBordersChanged();
}
bool UniversalSettings::metaForwardedToLatte() const
{
return m_metaForwardedToLatte;
}
bool UniversalSettings::kwin_metaForwardedToLatte() const
{
//! Indentify Plasma Desktop version
QProcess process;
process.start("kreadconfig5 --file kwinrc --group ModifierOnlyShortcuts --key Meta");
process.waitForFinished();
QString output(process.readAllStandardOutput());
output = output.remove("\n");
return (output == UniversalSettings::KWinMetaForwardToLatteString);
}
Dock::LayoutsMemoryUsage UniversalSettings::layoutsMemoryUsage() const
{
return m_memoryUsage;

7
app/universalsettings.h
Unescape Escape View File

@ -66,6 +66,8 @@ public:
bool canDisableBorders() const;
void setCanDisableBorders(bool enable);
bool metaForwardedToLatte() const;
bool showInfoWindow() const;
void setShowInfoWindow(bool show);
@ -131,15 +133,20 @@ private slots:
void saveConfig();
private:
static const QString KWinMetaForwardToLatteString;
void cleanupSettings();
void setUnifiedGlobalShortcuts(bool unified);
bool kwin_metaForwardedToLatte() const;
Dock::LayoutsMemoryUsage layoutsMemoryUsage() const;
void setLayoutsMemoryUsage(Dock::LayoutsMemoryUsage layoutsMemoryUsage);
private:
bool m_canDisableBorders{false};
bool m_metaForwardedToLatte{false};
bool m_showInfoWindow{true};
bool m_unifiedGlobalShortcuts{true};

20
containment/package/contents/ui/applet/AppletItemWrapper.qml
Unescape Escape View File

@ -607,8 +607,9 @@ Item{
Component.onCompleted: fixedIndex = parabolicManager.pseudoAppletIndex(index);
property real opacityN: universalSettings && universalSettings.unifiedGlobalShortcuts && root.showAppletsNumbers
&& container.canShowAppletNumberBadge && fixedIndex<20 ? 1 : 0
property real opacityN: universalSettings && container.canShowAppletNumberBadge &&
((universalSettings.unifiedGlobalShortcuts && root.showAppletsNumbers && fixedIndex<20)
|| (root.showMetaBadge && applet.id===applicationLauncherId)) ? 1 : 0
Behavior on opacityN {
NumberAnimation { duration: root.durationTime*2*units.longDuration }
@ -636,10 +637,19 @@ Item{
minimumWidth: 0.4 * root.iconSize
height: width
numberValue: appletNumberLoader.fixedIndex < 10 ? appletNumberLoader.fixedIndex : 0
textValue: (keysArrayIndex>=0 && keysArrayIndex<10) ? keysAboveTen[keysArrayIndex] : ''
textValue: {
if (root.showMetaBadge && applet.id === applicationLauncherId) {
return '\u2318';
} else if (keysArrayIndex>=0 && keysArrayIndex<10) {
return keysAboveTen[keysArrayIndex];
} else {
return '';
}
}
showNumber: appletNumberLoader.fixedIndex < 10
showText: appletNumberLoader.fixedIndex>=10 && appletNumberLoader.fixedIndex<20
showNumber: appletNumberLoader.fixedIndex < 10 && !(root.showMetaBadge && applet.id === applicationLauncherId)
showText: (appletNumberLoader.fixedIndex>=10 && appletNumberLoader.fixedIndex<20) ||
(root.showMetaBadge && applet.id === applicationLauncherId)
proportion: 0
radiusPerCentage: 50

10
containment/package/contents/ui/main.qml
Unescape Escape View File

@ -94,7 +94,9 @@ DragDrop.DropArea {
property bool forceSolidPanel: plasmoid.configuration.solidBackgroundForMaximized && dock && dock.visibility
&& Latte.WindowSystem.compositingActive
&&(dock.visibility.existsWindowMaximized || dock.visibility.existsWindowSnapped || hasExpandedApplet)
&&(dock.visibility.existsWindowMaximized || dock.visibility.existsWindowSnapped || hasExpandedApplet
|| showAppletsNumbers || showMetaBadge)
property bool forceTransparentPanel: root.backgroundOnlyOnMaximized
&& !(dock.visibility.existsWindowMaximized || dock.visibility.existsWindowSnapped)
&& Latte.WindowSystem.compositingActive
@ -135,6 +137,8 @@ DragDrop.DropArea {
property bool onlyAddingStarup: true //is used for the initialization phase in startup where there arent removals, this variable provides a way to grow icon size
property bool shrinkThickMargins: plasmoid.configuration.shrinkThickMargins
property bool showAppletsNumbers: false
property bool showMetaBadge: false
property int applicationLauncherId: -1
property bool solidPanel: Latte.WindowSystem.compositingActive ? plasmoid.configuration.solidPanel : true
//FIXME: possibly this is going to be the default behavior, this user choice
@ -1088,7 +1092,7 @@ DragDrop.DropArea {
}
//! this is called from globalshortcuts c++ side
function setShowAppletsNumbers(showNumbers){
function setShowAppletsNumbers(showNumbers, showMeta, applicationLauncher){
if (latteApplet) {
var base = universalSettings.unifiedGlobalShortcuts ? parabolicManager.pseudoAppletIndex(latteAppletPos) : 1;
latteApplet.setTasksNumbersBase(base - 1);
@ -1096,6 +1100,8 @@ DragDrop.DropArea {
}
showAppletsNumbers = showNumbers;
showMetaBadge = showMeta;
applicationLauncherId = applicationLauncher;
}
// This is called by dockcorona in response to a Meta+number shortcut.

Write Preview
Loading…
Cancel
Save