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

refactor: rename properties in View::Effects

Browse Source 
--effectsArea became "rect"
--maskArea became "mask"
pull/3/head
Michail Vourlakos 6 years ago
parent 825144a92e
commit 3a0a95e6a9
7 changed files with 64 additions and 67 deletions
Show Stats Download Patch File Download Diff File

4
app/dock/dockview.cpp
Unescape Escape View File

@ -488,9 +488,9 @@ bool DockView::contextMenuIsShown() const
int DockView::currentThickness() const int DockView::currentThickness() const
{ {
if (formFactor() == Plasma::Types::Vertical) { if (formFactor() == Plasma::Types::Vertical) {
return m_effects->maskArea().isNull() ? width() : m_effects->maskArea().width() - m_shadow; return m_effects->mask().isNull() ? width() : m_effects->mask().width() - m_shadow;
} else { } else {
return m_effects->maskArea().isNull() ? height() : m_effects->maskArea().height() - m_shadow; return m_effects->mask().isNull() ? height() : m_effects->mask().height() - m_shadow;
} }
} }

45
app/dock/effects.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ Effects::~Effects()
void Effects::init() void Effects::init()
{ {
connect(this, &Effects::drawEffectsChanged, this, &Effects::updateEffects); connect(this, &Effects::drawEffectsChanged, this, &Effects::updateEffects);
connect(this, &Effects::effectsAreaChanged, this, &Effects::updateEffects); connect(this, &Effects::rectChanged, this, &Effects::updateEffects);
connect(this, &Effects::drawShadowsChanged, this, [&]() { connect(this, &Effects::drawShadowsChanged, this, [&]() {
if (m_view->behaveAsPlasmaPanel()) { if (m_view->behaveAsPlasmaPanel()) {
@ -109,40 +109,40 @@ void Effects::setForceDrawCenteredBorders(bool draw)
m_forceDrawCenteredBorders = draw; m_forceDrawCenteredBorders = draw;
} }
QRect Effects::effectsArea() const QRect Effects::rect() const
{ {
return m_effectsArea; return m_rect;
} }
void Effects::setEffectsArea(QRect area) void Effects::setRect(QRect area)
{ {
QRect inWindowRect = area.intersected(QRect(0, 0, m_view->width(), m_view->height())); QRect inWindowRect = area.intersected(QRect(0, 0, m_view->width(), m_view->height()));
if (m_effectsArea == inWindowRect) { if (m_rect == inWindowRect) {
return; return;
} }
m_effectsArea = inWindowRect; m_rect = inWindowRect;
emit effectsAreaChanged(); emit rectChanged();
} }
QRect Effects::maskArea() const QRect Effects::mask() const
{ {
return m_maskArea; return m_mask;
} }
void Effects::setMaskArea(QRect area) void Effects::setMask(QRect area)
{ {
if (m_maskArea == area) if (m_mask == area)
return; return;
m_maskArea = area; m_mask = area;
if (KWindowSystem::compositingActive()) { if (KWindowSystem::compositingActive()) {
if (m_view->behaveAsPlasmaPanel()) { if (m_view->behaveAsPlasmaPanel()) {
m_view->setMask(QRect()); m_view->setMask(QRect());
} else { } else {
m_view->setMask(m_maskArea); m_view->setMask(m_mask);
} }
} else { } else {
//! this is used when compositing is disabled and provides //! this is used when compositing is disabled and provides
@ -161,23 +161,20 @@ void Effects::setMaskArea(QRect area)
m_background->setEnabledBorders(m_enabledBorders); m_background->setEnabledBorders(m_enabledBorders);
m_background->resizeFrame(area.size()); m_background->resizeFrame(area.size());
QRegion fixedMask = m_background->mask(); QRegion fixedMask = m_background->mask();
fixedMask.translate(m_maskArea.x(), m_maskArea.y()); fixedMask.translate(m_mask.x(), m_mask.y());
//! fix for KF5.32 that return empty QRegion's for the mask //! fix for KF5.32 that return empty QRegion's for the mask
if (fixedMask.isEmpty()) { if (fixedMask.isEmpty()) {
fixedMask = QRegion(m_maskArea); fixedMask = QRegion(m_mask);
} }
m_view->setMask(fixedMask); m_view->setMask(fixedMask);
} }
// qDebug() << "dock mask set:" << m_maskArea; // qDebug() << "dock mask set:" << m_mask;
emit maskAreaChanged(); emit maskChanged();
} }
void Effects::updateEffects() void Effects::updateEffects()
{ {
//! Don't apply any effect before the wayland surface is created under wayland //! Don't apply any effect before the wayland surface is created under wayland
@ -187,7 +184,7 @@ void Effects::updateEffects()
} }
if (!m_view->behaveAsPlasmaPanel()) { if (!m_view->behaveAsPlasmaPanel()) {
if (m_drawEffects && !m_effectsArea.isNull() && !m_effectsArea.isEmpty()) { if (m_drawEffects && !m_rect.isNull() && !m_rect.isEmpty()) {
//! this is used when compositing is disabled and provides //! this is used when compositing is disabled and provides
//! the correct way for the mask to be painted in order for //! the correct way for the mask to be painted in order for
//! rounded corners to be shown correctly //! rounded corners to be shown correctly
@ -200,13 +197,13 @@ void Effects::updateEffects()
} }
m_background->setEnabledBorders(m_enabledBorders); m_background->setEnabledBorders(m_enabledBorders);
m_background->resizeFrame(m_effectsArea.size()); m_background->resizeFrame(m_rect.size());
QRegion fixedMask = m_background->mask(); QRegion fixedMask = m_background->mask();
fixedMask.translate(m_effectsArea.x(), m_effectsArea.y()); fixedMask.translate(m_rect.x(), m_rect.y());
//! fix1, for KF5.32 that return empty QRegion's for the mask //! fix1, for KF5.32 that return empty QRegion's for the mask
if (fixedMask.isEmpty()) { if (fixedMask.isEmpty()) {
fixedMask = QRegion(m_effectsArea); fixedMask = QRegion(m_rect);
} }
KWindowEffects::enableBlurBehind(m_view->winId(), true, fixedMask); KWindowEffects::enableBlurBehind(m_view->winId(), true, fixedMask);

20
app/dock/effects.h
Unescape Escape View File

@ -40,8 +40,8 @@ class Effects: public QObject
Q_PROPERTY(bool drawShadows READ drawShadows WRITE setDrawShadows NOTIFY drawShadowsChanged) Q_PROPERTY(bool drawShadows READ drawShadows WRITE setDrawShadows NOTIFY drawShadowsChanged)
Q_PROPERTY(bool drawEffects READ drawEffects WRITE setDrawEffects NOTIFY drawEffectsChanged) Q_PROPERTY(bool drawEffects READ drawEffects WRITE setDrawEffects NOTIFY drawEffectsChanged)
Q_PROPERTY(QRect effectsArea READ effectsArea WRITE setEffectsArea NOTIFY effectsAreaChanged) Q_PROPERTY(QRect mask READ mask WRITE setMask NOTIFY maskChanged)
Q_PROPERTY(QRect maskArea READ maskArea WRITE setMaskArea NOTIFY maskAreaChanged) Q_PROPERTY(QRect rect READ rect WRITE setRect NOTIFY rectChanged)
Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged) Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged)
@ -58,11 +58,11 @@ public:
bool forceDrawCenteredBorders() const; bool forceDrawCenteredBorders() const;
void setForceDrawCenteredBorders(bool draw); void setForceDrawCenteredBorders(bool draw);
QRect maskArea() const; QRect mask() const;
void setMaskArea(QRect area); void setMask(QRect area);
QRect effectsArea() const; QRect rect() const;
void setEffectsArea(QRect area); void setRect(QRect area);
Plasma::FrameSvg::EnabledBorders enabledBorders() const; Plasma::FrameSvg::EnabledBorders enabledBorders() const;
@ -73,9 +73,9 @@ public slots:
signals: signals:
void drawShadowsChanged(); void drawShadowsChanged();
void drawEffectsChanged(); void drawEffectsChanged();
void effectsAreaChanged();
void enabledBordersChanged(); void enabledBordersChanged();
void maskAreaChanged(); void maskChanged();
void rectChanged();
private slots: private slots:
void init(); void init();
@ -85,8 +85,8 @@ private:
bool m_drawEffects{false}; bool m_drawEffects{false};
bool m_forceDrawCenteredBorders{false}; bool m_forceDrawCenteredBorders{false};
QRect m_effectsArea; QRect m_rect;
QRect m_maskArea; QRect m_mask;
QPointer<Latte::DockView> m_view; QPointer<Latte::DockView> m_view;

8
containment/package/contents/ui/DebugWindow.qml
Unescape Escape View File

@ -149,8 +149,8 @@ Window{
Text{ Text{
text: { text: {
if (dock && dock.effects && dock.effects.maskArea) { if (dock && dock.effects && dock.effects.mask) {
return dock.effects.maskArea.x +", "+ dock.effects.maskArea.y+" "+dock.effects.maskArea.width+"x"+dock.effects.maskArea.height; return dock.effects.mask.x +", "+ dock.effects.mask.y+" "+dock.effects.mask.width+"x"+dock.effects.mask.height;
} else { } else {
return "_,_ _x_"; return "_,_ _x_";
} }
@ -204,8 +204,8 @@ Window{
Text{ Text{
text: { text: {
if (dock && dock.effects && dock.effects.effectsArea) { if (dock && dock.effects && dock.effects.rect) {
return dock.effects.effectsArea.x + ", " + dock.effects.effectsArea.y + " " +dock.effects.effectsArea.width + "x" + dock.effects.effectsArea.height; return dock.effects.rect.x + ", " + dock.effects.rect.y + " " +dock.effects.rect.width + "x" + dock.effects.rect.height;
} else { } else {
return "_,_ _x_"; return "_,_ _x_";
} }

4
containment/package/contents/ui/EditModeVisual.qml
Unescape Escape View File

@ -219,7 +219,7 @@ Item{
efGeometry.width = width; efGeometry.width = width;
efGeometry.height = height; efGeometry.height = height;
dock.effects.effectsArea = efGeometry; dock.effects.rect = efGeometry;
} }
@ -329,7 +329,7 @@ Item{
ScriptAction{ ScriptAction{
script: { script: {
//! remove kwin effects when starting the animation //! remove kwin effects when starting the animation
dock.effects.effectsArea = Qt.rect(-1, -1, 0, 0); dock.effects.rect = Qt.rect(-1, -1, 0, 0);
} }
} }

2
containment/package/contents/ui/PanelBox.qml
Unescape Escape View File

@ -370,7 +370,7 @@ Item{
efGeometry.width = width; efGeometry.width = width;
efGeometry.height = height; efGeometry.height = height;
dock.effects.effectsArea = efGeometry; dock.effects.rect = efGeometry;
if (!Latte.WindowSystem.compositingActive) { if (!Latte.WindowSystem.compositingActive) {
visibilityManager.updateMaskArea(); visibilityManager.updateMaskArea();

48
containment/package/contents/ui/VisibilityManager.qml
Unescape Escape View File

@ -395,7 +395,7 @@ Item{
} }
} // end of compositing calculations } // end of compositing calculations
var maskArea = dock.effects.maskArea; var maskArea = dock.effects.mask;
if (Latte.WindowSystem.compositingActive) { if (Latte.WindowSystem.compositingActive) {
var maskLength = maskArea.width; //in Horizontal var maskLength = maskArea.width; //in Horizontal
@ -410,30 +410,30 @@ Item{
} else { } else {
//! no compositing case //! no compositing case
if (!dock.visibility.isHidden || !dock.visibility.supportsKWinEdges) { if (!dock.visibility.isHidden || !dock.visibility.supportsKWinEdges) {
localX = dock.effects.effectsArea.x; localX = dock.effects.rect.x;
localY = dock.effects.effectsArea.y; localY = dock.effects.rect.y;
} else { } else {
if (plasmoid.location === PlasmaCore.Types.BottomEdge) { if (plasmoid.location === PlasmaCore.Types.BottomEdge) {
localX = dock.effects.effectsArea.x; localX = dock.effects.rect.x;
localY = dock.effects.effectsArea.y+dock.effects.effectsArea.height+thicknessAutoHidden; localY = dock.effects.rect.y+dock.effects.rect.height+thicknessAutoHidden;
} else if (plasmoid.location === PlasmaCore.Types.TopEdge) { } else if (plasmoid.location === PlasmaCore.Types.TopEdge) {
localX = dock.effects.effectsArea.x; localX = dock.effects.rect.x;
localY = dock.effects.effectsArea.y - thicknessAutoHidden; localY = dock.effects.rect.y - thicknessAutoHidden;
} else if (plasmoid.location === PlasmaCore.Types.LeftEdge) { } else if (plasmoid.location === PlasmaCore.Types.LeftEdge) {
localX = dock.effects.effectsArea.x - thicknessAutoHidden; localX = dock.effects.rect.x - thicknessAutoHidden;
localY = dock.effects.effectsArea.y; localY = dock.effects.rect.y;
} else if (plasmoid.location === PlasmaCore.Types.RightEdge) { } else if (plasmoid.location === PlasmaCore.Types.RightEdge) {
localX = dock.effects.effectsArea.x + dock.effects.effectsArea.width + 1; localX = dock.effects.rect.x + dock.effects.rect.width + 1;
localY = dock.effects.effectsArea.y; localY = dock.effects.rect.y;
} }
} }
if (root.isHorizontal) { if (root.isHorizontal) {
tempThickness = dock.effects.effectsArea.height; tempThickness = dock.effects.rect.height;
tempLength = dock.effects.effectsArea.width; tempLength = dock.effects.rect.width;
} else { } else {
tempThickness = dock.effects.effectsArea.width; tempThickness = dock.effects.rect.width;
tempLength = dock.effects.effectsArea.height; tempLength = dock.effects.rect.height;
} }
} }
@ -455,12 +455,12 @@ Item{
} }
if (!Latte.WindowSystem.compositingActive) { if (!Latte.WindowSystem.compositingActive) {
dock.effects.maskArea = newMaskArea;//dock.effectsArea; dock.effects.mask = newMaskArea;
} else { } else {
if (dock.behaveAsPlasmaPanel && !root.editMode) { if (dock.behaveAsPlasmaPanel && !root.editMode) {
dock.effects.maskArea = Qt.rect(0,0,root.width,root.height); dock.effects.mask = Qt.rect(0,0,root.width,root.height);
} else { } else {
dock.effects.maskArea = newMaskArea; dock.effects.mask = newMaskArea;
} }
} }
} }
@ -468,7 +468,7 @@ Item{
//console.log("reached updating geometry ::: "+dock.maskArea); //console.log("reached updating geometry ::: "+dock.maskArea);
if(normalState){ if(normalState){
var tempGeometry = Qt.rect(dock.effects.maskArea.x, dock.effects.maskArea.y, dock.effects.maskArea.width, dock.effects.maskArea.height); var tempGeometry = Qt.rect(dock.effects.mask.x, dock.effects.mask.y, dock.effects.mask.width, dock.effects.mask.height);
//the shadows size must be removed from the maskArea //the shadows size must be removed from the maskArea
//before updating the localDockGeometry //before updating the localDockGeometry
@ -498,7 +498,7 @@ Item{
//console.log("update geometry ::: "+tempGeometry); //console.log("update geometry ::: "+tempGeometry);
if (!Latte.WindowSystem.compositingActive) { if (!Latte.WindowSystem.compositingActive) {
dock.localGeometry = dock.effects.effectsArea; dock.localGeometry = dock.effects.rect;
} else { } else {
dock.localGeometry = tempGeometry; dock.localGeometry = tempGeometry;
} }
@ -522,10 +522,10 @@ Item{
} }
Rectangle{ Rectangle{
x: dock ? dock.effects.maskArea.x : -1 x: dock ? dock.effects.mask.x : -1
y: dock ? dock.effects.maskArea.y : -1 y: dock ? dock.effects.mask.y : -1
height: dock ? dock.effects.maskArea.height : 0 height: dock ? dock.effects.mask.height : 0
width: dock ? dock.effects.maskArea.width : 0 width: dock ? dock.effects.mask.width : 0
border.color: "green" border.color: "green"
border.width: 1 border.width: 1

Write Preview
Loading…
Cancel
Save