kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 01:33:50 +03:00
Code Issues Projects Releases Wiki Activity

shortcuts:wait for view to fully shown properly

Browse Source 
--the new approach is not using timers but actual
events from View in order to identify when the
view is fully shown and when their popup is actual
visible. This way popup showing and view slide-in
is always synchronized properly

BUG:425078
This commit is contained in:
Michail Vourlakos 2021-05-13 20:09:05 +03:00
parent 8028efaa6c
commit 76549a9f99
7 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/shortcuts/globalshortcuts.cpp
View File

@ -52,12 +52,9 @@
#include <Plasma/Applet>
#include <Plasma/Containment>
#define SHORTCUTBLOCKHIDINGTYPE "globalshortcuts::blockHiding()"
namespace Latte {
const int APPLETEXECUTIONDELAY = 400;
GlobalShortcuts::GlobalShortcuts(QObject *parent)
: QObject(parent)
{
@ -249,16 +246,21 @@ void GlobalShortcuts::activateLauncherMenu()
Latte::View *highestPriorityView = highestApplicationLauncherView(sortedViews);
if (highestPriorityView) {
if (highestPriorityView->visibility()->isHidden() && highestPriorityView->extendedInterface()->applicationLauncherInPopup()) {
if (!highestPriorityView->visibility()->isShownFully() && highestPriorityView->extendedInterface()->applicationLauncherInPopup()) {
m_lastInvokedAction = m_singleMetaAction;
//! wait for view to fully shown
connect(highestPriorityView->visibility(), &Latte::ViewPart::VisibilityManager::isShownFullyChanged, this, [&, highestPriorityView](){
if (highestPriorityView->visibility()->isShownFully()) {
highestPriorityView->extendedInterface()->toggleAppletExpanded(highestPriorityView->extendedInterface()->applicationLauncherId());
//!remove that signal tracking
disconnect(highestPriorityView->visibility(), &Latte::ViewPart::VisibilityManager::isShownFullyChanged, this, nullptr);
}
});
//! That signal is removed from Latte::View only when the popup is really shown!
highestPriorityView->visibility()->addBlockHidingEvent(SHORTCUTBLOCKHIDINGTYPE);
//! delay the execution in order to show first the view
QTimer::singleShot(APPLETEXECUTIONDELAY, [this, highestPriorityView]() {
highestPriorityView->extendedInterface()->toggleAppletExpanded(highestPriorityView->extendedInterface()->applicationLauncherId());
highestPriorityView->visibility()->removeBlockHidingEvent(SHORTCUTBLOCKHIDINGTYPE);
});
} else {
highestPriorityView->extendedInterface()->toggleAppletExpanded(highestPriorityView->extendedInterface()->applicationLauncherId());
}
@ -270,13 +272,17 @@ bool GlobalShortcuts::activatePlasmaTaskManager(const Latte::View *view, int ind
bool activation{modifier == static_cast<Qt::Key>(Qt::META)};
bool newInstance{!activation};
if (view->visibility()->isHidden()) {
//! delay the execution in order to show first the view
QTimer::singleShot(APPLETEXECUTIONDELAY, [this, view, index, activation]() {
if (activation) {
view->extendedInterface()->activatePlasmaTask(index);
} else {
view->extendedInterface()->newInstanceForPlasmaTask(index);
if (!view->visibility()->isShownFully()) {
//! wait for view to fully shown
connect(view->visibility(), &Latte::ViewPart::VisibilityManager::isShownFullyChanged, this, [&, view, index, activation](){
if (view->visibility()->isShownFully()) {
if (activation) {
view->extendedInterface()->activatePlasmaTask(index);
} else {
view->extendedInterface()->newInstanceForPlasmaTask(index);
}
//!remove that signal tracking
disconnect(view->visibility(), &Latte::ViewPart::VisibilityManager::isShownFullyChanged, this, nullptr);
}
});
@ -298,13 +304,17 @@ bool GlobalShortcuts::activateLatteEntry(Latte::View *view, int index, Qt::Key m
int appletId = view->extendedInterface()->appletIdForVisualIndex(index);
bool hasPopUp {(appletId>-1 && view->extendedInterface()->appletIsExpandable(appletId))};
if (view->visibility()->isHidden() && hasPopUp) {
//! delay the execution in order to show first the view
QTimer::singleShot(APPLETEXECUTIONDELAY, [this, view, index, activation]() {
if (activation) {
view->extendedInterface()->activateEntry(index);
} else {
view->extendedInterface()->newInstanceForEntry(index);
if (!view->visibility()->isShownFully() && hasPopUp) {
//! wait for view to fully shown
connect(view->visibility(), &Latte::ViewPart::VisibilityManager::isShownFullyChanged, this, [&, view, index, activation](){
if (view->visibility()->isShownFully()) {
if (activation) {
view->extendedInterface()->activateEntry(index);
} else {
view->extendedInterface()->newInstanceForEntry(index);
}
//!remove that signal tracking
disconnect(view->visibility(), &Latte::ViewPart::VisibilityManager::isShownFullyChanged, this, nullptr);
}
});

2
app/shortcuts/globalshortcuts.h
View File

@ -53,6 +53,8 @@ class GlobalShortcuts : public QObject
Q_OBJECT
public:
static constexpr const char* SHORTCUTBLOCKHIDINGTYPE = "globalshortcuts::blockHiding()";
GlobalShortcuts(QObject *parent = nullptr);
~GlobalShortcuts() override;

2
app/view/containmentinterface.cpp
View File

@ -402,7 +402,7 @@ int ContainmentInterface::appletIdForVisualIndex(const int index)
identifyShortcutsHost();
if (!m_appletIdForIndexMethod.isValid()) {
return false;
return -1;
}
QVariant appletId{-1};

5
app/view/view.cpp
View File

@ -695,6 +695,11 @@ void View::addTransientWindow(QWindow *window)
QString winPtrStr = "0x" + QString::number((qulonglong)window,16);
m_visibility->addBlockHidingEvent(winPtrStr);
if (m_visibility->hasBlockHidingEvent(Latte::GlobalShortcuts::SHORTCUTBLOCKHIDINGTYPE)) {
m_visibility->removeBlockHidingEvent(Latte::GlobalShortcuts::SHORTCUTBLOCKHIDINGTYPE);
}
connect(window, &QWindow::visibleChanged, this, &View::removeTransientWindow);
}
}

5
app/view/visibilitymanager.cpp
View File

@ -530,6 +530,11 @@ void VisibilityManager::setIsFloatingGapWindowEnabled(bool enabled)
emit isFloatingGapWindowEnabledChanged();
}
bool VisibilityManager::hasBlockHidingEvent(const QString &type)
{
return (!type.isEmpty() && m_blockHidingEvents.contains(type));
}
void VisibilityManager::addBlockHidingEvent(const QString &type)
{
if (m_blockHidingEvents.contains(type) || type.isEmpty()) {

1
app/view/visibilitymanager.h
View File

@ -115,6 +115,7 @@ public:
int timerHide() const;
void setTimerHide(int msec);
bool hasBlockHidingEvent(const QString &type);
bool isSidebar() const;
//! KWin Edges Support functions

10
containment/package/contents/ui/abilities/Indexer.qml
View File

@ -51,25 +51,25 @@ Ability.IndexerPrivate {
var appletItem = sLayout.children[i];
if (visibleIndexBelongsAtApplet(appletItem, itemVisibleIndex)) {
return appletItem.index;
return appletItem.applet ? appletItem.applet.id : -1;
}
}
var mLayout = layouts.mainLayout;
for (var i=0; i<mLayout.children.length; ++i){
var appletItem = sLayout.children[i];
var appletItem = mLayout.children[i];
if (visibleIndexBelongsAtApplet(appletItem, itemVisibleIndex)) {
return appletItem.index;
return appletItem.applet ? appletItem.applet.id : -1;
}
}
var eLayout = layouts.endLayout;
for (var i=0; i<eLayout.children.length; ++i){
var appletItem = sLayout.children[i];
var appletItem = eLayout.children[i];
if (visibleIndexBelongsAtApplet(appletItem, itemVisibleIndex)) {
return appletItem.index;
return appletItem.applet ? appletItem.applet.id : -1;
}
}