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

import:dont update view:local_geometry when hidden

Browse Source 
--if this does not apply then local geometry are not valid
when views become hidden
This commit is contained in:
Michail Vourlakos 2020-03-19 12:01:41 +02:00
parent 3246ce2447
commit e0c04a9c6f
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/wm/tracker/windowstracker.cpp
View File

@ -837,16 +837,23 @@ void Windows::updateHints(Latte::View *view)
WindowId touchWinId;
WindowId activeTouchWinId;
qDebug() << " -- TRACKING REPORT (SCREEN)--";
//! First Pass
for (const auto &winfo : m_windows) {
if (!existsFaultyWindow && (winfo.wid()<=0 || winfo.geometry() == QRect(0, 0, 0, 0))) {
existsFaultyWindow = true;
}
if (!m_wm->inCurrentDesktopActivity(winfo) || m_wm->isRegisteredPlasmaIgnoredWindow(winfo.wid())) {
if ( !m_wm->inCurrentDesktopActivity(winfo)
|| m_wm->isRegisteredPlasmaIgnoredWindow(winfo.wid())
|| winfo.isMinimized()) {
continue;
}
qDebug() << " _ _ _ ";
qDebug() << "TRACKING | WINDOW INFO :: " << winfo.wid() << " _ " << winfo.appName() << " _ " << winfo.geometry() << " _ " << winfo.display();
if (isActive(winfo)) {
foundActive = true;
}
@ -864,19 +871,22 @@ void Windows::updateHints(Latte::View *view)
}
//! Touching windows flags
if (isTouchingViewEdge(view, winfo) || isTouchingView(view, winfo)) {
bool touchingViewEdge = isTouchingViewEdge(view, winfo);
bool touchingView = isTouchingView(view, winfo);
if (touchingViewEdge || touchingView) {
if (winfo.isActive()) {
//qDebug() << " ACTIVE-TOUCH :: " << winfo.wid() << " _ " << winfo.appName() << " _ " << winfo.geometry() << " _ " << winfo.display();
foundActiveTouchInCurScreen = true;
activeTouchWinId = winfo.wid();
} else {
//qDebug() << " TOUCH :: " << winfo.wid() << " _ " << winfo.appName() << " _ " << winfo.geometry() << " _ " << winfo.display();
foundTouchInCurScreen = true;
touchWinId = winfo.wid();
}
}
//qDebug() << "window geometry ::: " << winfo.geometry();
qDebug() << "TRACKING | ACTIVE:"<< foundActive << " ACT_CUR_SCR:" << foundTouchInCurScreen << " MAXIM:"<<foundMaximizedInCurScreen;
qDebug() << "TRACKING | TOUCHING VIEW EDGE:"<< touchingViewEdge << " TOUCHING VIEW:" << foundTouchInCurScreen;
}
if (existsFaultyWindow) {
@ -897,7 +907,9 @@ void Windows::updateHints(Latte::View *view)
WindowId mainWindowId = activeInfo.isChildWindow() ? activeInfo.parentId() : activeWinId;
for (const auto &winfo : m_windows) {
if (!m_wm->inCurrentDesktopActivity(winfo) || m_wm->isRegisteredPlasmaIgnoredWindow(winfo.wid())) {
if (!m_wm->inCurrentDesktopActivity(winfo)
|| m_wm->isRegisteredPlasmaIgnoredWindow(winfo.wid())
|| winfo.isMinimized())) {
continue;
}
@ -953,12 +965,12 @@ void Windows::updateHints(Latte::View *view)
}
//! Debug
//qDebug() << " -- TRACKING REPORT (SCREEN)--";
//qDebug() << "TRACKING | SCREEN: " << view->positioner()->currentScreenId() << " , EDGE:" << view->location() << " , ENABLED:" << enabled(view);
//qDebug() << "TRACKING | activeWindowTouching: " << foundActiveTouchInCurScreen << " ,activeWindowMaximized: " << activeWindowMaximized(view);
//qDebug() << "TRACKING | existsWindowActive: " << foundActiveInCurScreen << " , existsWindowMaximized:" << existsWindowMaximized(view)
// << " , existsWindowTouching:"<<existsWindowTouching(view);
//qDebug() << "TRACKING | existsActiveGroupTouching: " << foundActiveGroupTouchInCurScreen;
qDebug() << "TRACKING | _________ FINAL RESULTS ________";
qDebug() << "TRACKING | SCREEN: " << view->positioner()->currentScreenId() << " , EDGE:" << view->location() << " , ENABLED:" << enabled(view);
qDebug() << "TRACKING | activeWindowTouching: " << foundActiveTouchInCurScreen << " ,activeWindowMaximized: " << activeWindowMaximized(view);
qDebug() << "TRACKING | existsWindowActive: " << foundActiveInCurScreen << " , existsWindowMaximized:" << existsWindowMaximized(view)
<< " , existsWindowTouching:"<<existsWindowTouching(view);
qDebug() << "TRACKING | existsActiveGroupTouching: " << foundActiveGroupTouchInCurScreen;
}
void Windows::updateHints(Latte::Layout::GenericLayout *layout) {
@ -982,7 +994,9 @@ void Windows::updateHints(Latte::Layout::GenericLayout *layout) {
existsFaultyWindow = true;
}
if (!m_wm->inCurrentDesktopActivity(winfo) || m_wm->isRegisteredPlasmaIgnoredWindow(winfo.wid())) {
if (!m_wm->inCurrentDesktopActivity(winfo)
|| m_wm->isRegisteredPlasmaIgnoredWindow(winfo.wid())
|| winfo.isMinimized()) {
continue;
}

18
containment/package/contents/ui/VisibilityManager.qml
View File

@ -125,8 +125,16 @@ Item{
Binding{
target: latteView
property:"normalThickness"
when: latteView && inPublishingState
value: root.behaveAsPlasmaPanel && !root.editMode ? thicknessAsPanel : thicknessNormalOriginal
//! workaround Qt 5.14 bindings warning to not restore values because to qt 6.0 changes
//when: latteView && inPublishingState
readonly property bool inactiveness: latteView && inPublishingState
value: {
if (!inactiveness) {
return;
}
return root.behaveAsPlasmaPanel && !root.editMode ? thicknessAsPanel : thicknessNormalOriginal
}
}
Binding{
@ -714,7 +722,11 @@ Item{
var validIconSize = (root.iconSize===root.maxIconSize || root.iconSize === automaticItemSizer.automaticIconSizeBasedSize);
//console.log("reached updating geometry ::: "+dock.maskArea);
if(inPublishingState && (normalState || root.editMode)) {
if(inPublishingState && !latteView.visibility.isHidden && (normalState || root.editMode)) {
//! Important: Local Geometry must not be updated when view ISHIDDEN
//! because it breaks Dodge(s) modes in such case
var localGeometry = Qt.rect(0, 0, root.width, root.height);
//the shadows size must be removed from the maskArea