kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-24 02:50:35 +03:00
Code Issues Projects Releases Wiki Activity

Revert "consider mask thickness for struts"

Browse Source 
This reverts commit a4764024db8324c3dbddd698d858f9d91737a8f8.
This commit is contained in:
Michail Vourlakos 2019-06-15 15:43:32 +03:00
parent df3118fc98
commit 3c5c59e149
3 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/view/effects.cpp
View File

@ -193,36 +193,6 @@ void Effects::setSettingsMaskSubtracted(bool enabled)
emit settingsMaskSubtractedChanged();
}
int Effects::maskThickness() const
{
if (m_view->mask().isEmpty()) {
return m_view->formFactor() == Plasma::Types::Horizontal ? m_view->width() : m_view->height();
}
switch (m_view->location()) {
case Plasma::Types::TopEdge:
return m_view->mask().boundingRect().bottom();
break;
case Plasma::Types::LeftEdge:
return m_view->mask().boundingRect().right();
break;
case Plasma::Types::RightEdge:
return m_view->mask().boundingRect().left();
break;
case Plasma::Types::BottomEdge:
return m_view->mask().boundingRect().top();
break;
default:
return 64;
break;
}
}
QRegion Effects::subtrackedMaskFromWindow(QRegion initialRegion, QQuickView *window)
{
QRegion subtractedMask = initialRegion;

2
app/view/effects.h
View File

@ -83,8 +83,6 @@ public:
int innerShadow() const;
void setInnerShadow(int shadow);
int maskThickness() const;
QRect mask() const;
void setMask(QRect area);

15
app/view/visibilitymanager.cpp
View File

@ -21,7 +21,6 @@
#include "visibilitymanager.h"
// local
#include "effects.h"
#include "positioner.h"
#include "screenedgeghostwindow.h"
#include "view.h"
@ -268,28 +267,26 @@ QRect VisibilityManager::acceptableStruts()
{
QRect calcs;
int visibleThickness = qMin(m_latteView->effects()->maskThickness(), m_latteView->normalThickness());
switch (m_latteView->location()) {
case Plasma::Types::TopEdge: {
calcs = QRect(m_latteView->x(), m_latteView->y(), m_latteView->width(), visibleThickness);
calcs = QRect(m_latteView->x(), m_latteView->y(), m_latteView->width(), m_latteView->normalThickness());
break;
}
case Plasma::Types::BottomEdge: {
int y = m_latteView->y() + m_latteView->height() - visibleThickness;
calcs = QRect(m_latteView->x(), y, m_latteView->width(), visibleThickness);
int y = m_latteView->y() + m_latteView->height() - m_latteView->normalThickness();
calcs = QRect(m_latteView->x(), y, m_latteView->width(), m_latteView->normalThickness());
break;
}
case Plasma::Types::LeftEdge: {
calcs = QRect(m_latteView->x(), m_latteView->y(), visibleThickness, m_latteView->height());
calcs = QRect(m_latteView->x(), m_latteView->y(), m_latteView->normalThickness(), m_latteView->height());
break;
}
case Plasma::Types::RightEdge: {
int x = m_latteView->x() + m_latteView->width() - visibleThickness;
calcs = QRect(x, m_latteView->y(), visibleThickness, m_latteView->height());
int x = m_latteView->x() + m_latteView->width() - m_latteView->normalThickness();
calcs = QRect(x, m_latteView->y(), m_latteView->normalThickness(), m_latteView->height());
break;
}
}