Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: layershell wrap bugs #19

Merged
merged 1 commit into from
Nov 13, 2023
Merged

fix: layershell wrap bugs #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions example/panel-example/package/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ import org.deepin.ds 1.0
Window {
id: root
visible: true
width: Screen.width
height: 200
DLayerShellWindow.anchors: DLayerShellWindow.AnchorBottom
DLayerShellWindow.anchors: DLayerShellWindow.AnchorBottom | DLayerShellWindow.AnchorLeft | DLayerShellWindow.AnchorRight

Repeater {
anchors.fill: parent
Expand Down
4 changes: 2 additions & 2 deletions frame/layershell/dlayershellwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class DLayerShellWindowPrivate

QWindow* parentWindow;
QString scope = QStringLiteral("window");
DLayerShellWindow::Anchors anchors = {DLayerShellWindow::AnchorTop | DLayerShellWindow::AnchorBottom | DLayerShellWindow::AnchorLeft | DLayerShellWindow::AnchorRight};
DLayerShellWindow::Anchors anchors = {DLayerShellWindow::AnchorNone};
int32_t exclusionZone = 0;
DLayerShellWindow::KeyboardInteractivity keyboardInteractivity = DLayerShellWindow::KeyboardInteractivityExclusive;
DLayerShellWindow::KeyboardInteractivity keyboardInteractivity = DLayerShellWindow::KeyboardInteractivityNone;
DLayerShellWindow::Layer layer = DLayerShellWindow::LayerTop;
int leftMargin = 0;
int rightMargin = 0;
Expand Down
19 changes: 12 additions & 7 deletions frame/layershell/qwaylandlayershellsurface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,21 @@
init(shell->get_layer_surface(window->waylandSurface()->object(), output, m_dlayerShellWindow->layer(), m_dlayerShellWindow->scope()));

set_layer(m_dlayerShellWindow->layer());
connect(m_dlayerShellWindow, &DLayerShellWindow::layerChanged, this, [this](){
connect(m_dlayerShellWindow, &DLayerShellWindow::layerChanged, this, [this, window](){
set_layer(m_dlayerShellWindow->layer());
window->waylandSurface()->commit();
});

set_anchor(m_dlayerShellWindow->anchors());
connect(m_dlayerShellWindow, &DLayerShellWindow::anchorsChanged, this,[this](){
connect(m_dlayerShellWindow, &DLayerShellWindow::anchorsChanged, this,[this, window](){
set_anchor(m_dlayerShellWindow->anchors());
window->waylandSurface()->commit();
});

set_exclusive_zone(m_dlayerShellWindow->exclusionZone());
connect(m_dlayerShellWindow, &DLayerShellWindow::exclusionZoneChanged, this,[this](){
connect(m_dlayerShellWindow, &DLayerShellWindow::exclusionZoneChanged, this,[this, window](){
set_exclusive_zone(m_dlayerShellWindow->exclusionZone());
window->waylandSurface()->commit();
});

set_margin(m_dlayerShellWindow->topMargin(), m_dlayerShellWindow->rightMargin(), m_dlayerShellWindow->bottomMargin(), m_dlayerShellWindow->leftMargin());
Expand All @@ -58,8 +61,9 @@
});

set_keyboard_interactivity(m_dlayerShellWindow->keyboardInteractivity());
connect(m_dlayerShellWindow, &DLayerShellWindow::keyboardInteractivityChanged, this, [this](){
connect(m_dlayerShellWindow, &DLayerShellWindow::keyboardInteractivityChanged, this, [this, window](){
set_keyboard_interactivity(m_dlayerShellWindow->keyboardInteractivity());
window->waylandSurface()->commit();
});


Expand All @@ -73,7 +77,7 @@
size.setHeight(0);
}

if (size.isValid() && !size.isEmpty()) {
if (size.isValid()) {
set_size(size.width(), size.height());
}
}
Expand Down Expand Up @@ -109,10 +113,11 @@
window()->resizeFromApplyConfigure(m_pendingSize);
}

void QWaylandLayeShellSurface::setWindowGeometry(const QRect &geometry)

Check warning on line 116 in frame/layershell/qwaylandlayershellsurface.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'setWindowGeometry' is never used.
{
const bool horizontallyConstrained = m_dlayerShellWindow->anchors() & (DLayerShellWindow::AnchorLeft & DLayerShellWindow::AnchorRight);
const bool verticallyConstrained = m_dlayerShellWindow->anchors() & (DLayerShellWindow::AnchorTop & DLayerShellWindow::AnchorBottom);
auto anchors = m_dlayerShellWindow->anchors();
const bool horizontallyConstrained =(anchors & (DLayerShellWindow::AnchorLeft | DLayerShellWindow::AnchorRight)) == (DLayerShellWindow::AnchorLeft | DLayerShellWindow::AnchorRight);
const bool verticallyConstrained = (anchors & (DLayerShellWindow::AnchorTop | DLayerShellWindow::AnchorBottom)) == (DLayerShellWindow::AnchorTop | DLayerShellWindow::AnchorBottom);

QSize size = geometry.size();
if (horizontallyConstrained) {
Expand Down
56 changes: 34 additions & 22 deletions frame/layershell/x11dlayershellemulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later

#include "dlayershellwindow.h"
#include "dsglobal.h"
#include "x11dlayershellemulation.h"

#include <QDebug>
Expand All @@ -16,22 +17,24 @@
#include <xcb/xcb.h>
#include <xcb/xcb_ewmh.h>

DS_BEGIN_NAMESPACE

LayerShellEmulation::LayerShellEmulation(QWindow* window, QObject *parent)
: QObject(parent)
, m_window(window)
, m_dlayerShellWindow(DS_NAMESPACE::DLayerShellWindow::get(m_window))
, m_dlayerShellWindow(DLayerShellWindow::get(m_window))
{
m_window->setFlag(Qt::FramelessWindowHint);
onLayerChanged();
connect(m_dlayerShellWindow, &DS_NAMESPACE::DLayerShellWindow::layerChanged, this, &LayerShellEmulation::onLayerChanged);
connect(m_dlayerShellWindow, &DLayerShellWindow::layerChanged, this, &LayerShellEmulation::onLayerChanged);

onPositionChanged();
connect(m_dlayerShellWindow, &DS_NAMESPACE::DLayerShellWindow::anchorsChanged, this, &LayerShellEmulation::onPositionChanged);
connect(m_dlayerShellWindow, &DS_NAMESPACE::DLayerShellWindow::marginsChanged, this, &LayerShellEmulation::onPositionChanged);
connect(m_dlayerShellWindow, &DLayerShellWindow::anchorsChanged, this, &LayerShellEmulation::onPositionChanged);
connect(m_dlayerShellWindow, &DLayerShellWindow::marginsChanged, this, &LayerShellEmulation::onPositionChanged);

onExclusionZoneChanged();
connect(m_dlayerShellWindow, &DS_NAMESPACE::DLayerShellWindow::anchorsChanged, this, &LayerShellEmulation::onExclusionZoneChanged);
connect(m_dlayerShellWindow, &DS_NAMESPACE::DLayerShellWindow::exclusionZoneChanged, this, &LayerShellEmulation::onExclusionZoneChanged);
connect(m_dlayerShellWindow, &DLayerShellWindow::anchorsChanged, this, &LayerShellEmulation::onExclusionZoneChanged);
connect(m_dlayerShellWindow, &DLayerShellWindow::exclusionZoneChanged, this, &LayerShellEmulation::onExclusionZoneChanged);

// qml height or wdth may update later, need to update anchor postion and exclusion zone
connect(m_window, &QWindow::widthChanged, this, &LayerShellEmulation::onExclusionZoneChanged);
Expand All @@ -56,23 +59,23 @@ void LayerShellEmulation::onLayerChanged()
{
auto xcbWindow = dynamic_cast<QNativeInterface::Private::QXcbWindow*>(m_window->handle());
switch (m_dlayerShellWindow->layer()) {
case DS_NAMESPACE::DLayerShellWindow::LayerBackground: {
case DLayerShellWindow::LayerBackground: {
m_window->setFlags(m_window->flags() & ~Qt::WindowStaysOnBottomHint);
xcbWindow->setWindowType(QNativeInterface::Private::QXcbWindow::Desktop);
break;
}
case DS_NAMESPACE::DLayerShellWindow::LayerButtom: {
case DLayerShellWindow::LayerButtom: {
//use Normal type will influenced by exclusionZone
xcbWindow->setWindowType(QNativeInterface::Private::QXcbWindow::Normal);
m_window->setFlags(Qt::WindowStaysOnBottomHint);
break;
}
case DS_NAMESPACE::DLayerShellWindow::LayerTop: {
case DLayerShellWindow::LayerTop: {
m_window->setFlags(m_window->flags() & ~Qt::WindowStaysOnBottomHint);
xcbWindow->setWindowType(QNativeInterface::Private::QXcbWindow::Dock);
break;
}
case DS_NAMESPACE::DLayerShellWindow::LayerOverlay: {
case DLayerShellWindow::LayerOverlay: {
// on deepin Notification will be influenced by exclusionZone,
// while plasma works all right, maybe deepin kwin bug?
// FIXME: fix above
Expand All @@ -86,25 +89,33 @@ void LayerShellEmulation::onLayerChanged()
void LayerShellEmulation::onPositionChanged()
{
auto anchors = m_dlayerShellWindow->anchors();
auto x = m_window->x(), y = m_window->y();
auto screen = m_window->screen();
if (anchors & DS_NAMESPACE::DLayerShellWindow::AnchorRight) {
auto x = (screen->geometry().right() - m_window->width()) / 2;
auto y = (screen->geometry().height() - m_window->height()) / 2;
if (anchors & DLayerShellWindow::AnchorRight) {
x = (screen->geometry().right() - m_window->width() - m_dlayerShellWindow->rightMargin());
}

if (anchors & DS_NAMESPACE::DLayerShellWindow::AnchorBottom) {
if (anchors & DLayerShellWindow::AnchorBottom) {
y = (screen->geometry().bottom() - m_window->height() - m_dlayerShellWindow->bottomMargin());
}
if (anchors & DS_NAMESPACE::DLayerShellWindow::AnchorLeft) {
if (anchors & DLayerShellWindow::AnchorLeft) {
x = (screen->geometry().left() + m_dlayerShellWindow->leftMargin());
}
if (anchors & DS_NAMESPACE::DLayerShellWindow::AnchorTop) {
if (anchors & DLayerShellWindow::AnchorTop) {
y = (screen->geometry().top() + m_dlayerShellWindow->topMargin());
}

if (anchors == DS_NAMESPACE::DLayerShellWindow::AnchorNone) {
x = (screen->geometry().right() - m_window->width()) / 2;
y = (screen->geometry().height() - m_window->height()) / 2;
const bool horizontallyConstrained =(anchors & (DLayerShellWindow::AnchorLeft | DLayerShellWindow::AnchorRight)) == (DLayerShellWindow::AnchorLeft | DLayerShellWindow::AnchorRight);
const bool verticallyConstrained = (anchors & (DLayerShellWindow::AnchorTop | DLayerShellWindow::AnchorBottom)) == (DLayerShellWindow::AnchorTop | DLayerShellWindow::AnchorBottom);

if (horizontallyConstrained) {
x = (screen->geometry().left());
m_window->setWidth(screen->geometry().width());
}
if (verticallyConstrained) {
y = (screen->geometry().top());
m_window->setHeight(screen->geometry().height());
}
m_window->setX(x), m_window->setY(y);
}
Expand All @@ -122,19 +133,19 @@ void LayerShellEmulation::onExclusionZoneChanged()
xcb_ewmh_wm_strut_partial_t strut_partial;
memset(&strut_partial, 0, sizeof(xcb_ewmh_wm_strut_partial_t));
auto anchors = m_dlayerShellWindow->anchors();
if ((anchors == DS_NAMESPACE::DLayerShellWindow::AnchorLeft) || (anchors ^ DS_NAMESPACE::DLayerShellWindow::AnchorLeft) == (DS_NAMESPACE::DLayerShellWindow::AnchorTop | DS_NAMESPACE::DLayerShellWindow::AnchorBottom)) {
if ((anchors == DLayerShellWindow::AnchorLeft) || (anchors ^ DLayerShellWindow::AnchorLeft) == (DLayerShellWindow::AnchorTop | DLayerShellWindow::AnchorBottom)) {
strut_partial.left = m_dlayerShellWindow->exclusionZone() * scaleFactor;
strut_partial.left_start_y = m_window->y();
strut_partial.left_end_y = m_window->y() + m_window->height();
} else if ((anchors == DS_NAMESPACE::DLayerShellWindow::AnchorRight) || (anchors ^ DS_NAMESPACE::DLayerShellWindow::AnchorRight) == (DS_NAMESPACE::DLayerShellWindow::AnchorTop | DS_NAMESPACE::DLayerShellWindow::AnchorBottom)) {
} else if ((anchors == DLayerShellWindow::AnchorRight) || (anchors ^ DLayerShellWindow::AnchorRight) == (DLayerShellWindow::AnchorTop | DLayerShellWindow::AnchorBottom)) {
strut_partial.right = m_dlayerShellWindow->exclusionZone() * scaleFactor;
strut_partial.right_start_y = m_window->y();
strut_partial.right_end_y = m_window->y() + m_window->height();
} else if ((anchors == DS_NAMESPACE::DLayerShellWindow::AnchorTop) || (anchors ^ DS_NAMESPACE::DLayerShellWindow::AnchorTop) == (DS_NAMESPACE::DLayerShellWindow::AnchorLeft | DS_NAMESPACE::DLayerShellWindow::AnchorRight)) {
} else if ((anchors == DLayerShellWindow::AnchorTop) || (anchors ^ DLayerShellWindow::AnchorTop) == (DLayerShellWindow::AnchorLeft | DLayerShellWindow::AnchorRight)) {
strut_partial.top = m_dlayerShellWindow->exclusionZone() * scaleFactor;
strut_partial.top_start_x = m_window->x();
strut_partial.top_end_x = m_window->x() + m_window->width();
} else if ((anchors == DS_NAMESPACE::DLayerShellWindow::AnchorBottom) || (anchors ^ DS_NAMESPACE::DLayerShellWindow::AnchorBottom) == (DS_NAMESPACE::DLayerShellWindow::AnchorLeft | DS_NAMESPACE::DLayerShellWindow::AnchorRight)) {
} else if ((anchors == DLayerShellWindow::AnchorBottom) || (anchors ^ DLayerShellWindow::AnchorBottom) == (DLayerShellWindow::AnchorLeft | DLayerShellWindow::AnchorRight)) {
strut_partial.bottom = m_dlayerShellWindow->exclusionZone() * scaleFactor;
strut_partial.bottom_start_x = m_window->x();
strut_partial.bottom_end_x = m_window->x() + m_window->width();
Expand All @@ -147,3 +158,4 @@ void LayerShellEmulation::onExclusionZoneChanged()
// {
// // kwin no implentation on wayland
// }
DS_END_NAMESPACE
9 changes: 5 additions & 4 deletions frame/layershell/x11dlayershellemulation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

#pragma once

#include "dsglobal.h"
tsic404 marked this conversation as resolved.
Show resolved Hide resolved
#include "dlayershellwindow.h"

#include <QObject>
#include <QWindow>

#include <qobject.h>
#include <qtmetamacros.h>
#include <xcb/xcb.h>
#include <xcb/xproto.h>

class xcb_connection_t;

DS_BEGIN_NAMESPACE
class LayerShellEmulation : public QObject
{
Q_OBJECT
Expand All @@ -30,5 +30,6 @@ private slots:

private:
QWindow* m_window;
DS_NAMESPACE::DLayerShellWindow* m_dlayerShellWindow;
DLayerShellWindow* m_dlayerShellWindow;
};
DS_END_NAMESPACE