Commit 35fe3cb6 authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

Drop Toplevel::decorationRect()

Summary: It's identical to Toplevel::rect().

Test Plan: Compiles.

Reviewers: #kwin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D26971
parent 07553d20
......@@ -224,11 +224,6 @@ void Deleted::layoutDecorationRects(QRect& left, QRect& top, QRect& right, QRect
bottom = decoration_bottom;
}
QRect Deleted::decorationRect() const
{
return rect();
}
QRect Deleted::transparentRect() const
{
return transparent_rect;
......
......@@ -62,7 +62,6 @@ public:
return no_border;
}
void layoutDecorationRects(QRect &left, QRect &top, QRect &right, QRect &bottom) const;
QRect decorationRect() const override;
Layer layer() const override {
return m_layer;
}
......
......@@ -464,7 +464,7 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
X11Client *client = dynamic_cast<X11Client *>(toplevel);
Deleted *deleted = dynamic_cast<Deleted*>(toplevel);
const QRect decorationRect = toplevel->decorationRect();
const QRect decorationRect = toplevel->rect();
if (((client && !client->noBorder()) || (deleted && !deleted->noBorder())) &&
true) {
// decorated client
......
......@@ -788,7 +788,7 @@ QRegion Scene::Window::clientShape() const
QRegion Scene::Window::decorationShape() const
{
return QRegion(toplevel->decorationRect()) - toplevel->transparentRect();
return QRegion(toplevel->rect()) - toplevel->transparentRect();
}
QPoint Scene::Window::bufferOffset() const
......
......@@ -75,11 +75,6 @@ QDebug& operator<<(QDebug& stream, const Toplevel* cl)
return stream;
}
QRect Toplevel::decorationRect() const
{
return rect();
}
void Toplevel::detectShape(xcb_window_t id)
{
const bool wasShape = is_shape;
......
......@@ -376,8 +376,10 @@ public:
*/
virtual QPoint clientContentPos() const;
virtual QSize clientSize() const = 0;
virtual QRect visibleRect() const; // the area the window occupies on the screen
virtual QRect decorationRect() const; // rect including the decoration shadows
/**
* Returns a rectangle that the window occupies on the screen, including drop-shadows.
*/
virtual QRect visibleRect() const;
virtual QRect transparentRect() const = 0;
virtual bool isClient() const;
virtual bool isDeleted() const;
......
......@@ -2562,11 +2562,6 @@ void X11Client::setSessionActivityOverride(bool needed)
updateActivities(false);
}
QRect X11Client::decorationRect() const
{
return QRect(0, 0, width(), height());
}
Xcb::Property X11Client::fetchFirstInTabBox() const
{
return Xcb::Property(false, m_client, atoms->kde_first_in_window_list,
......
......@@ -271,9 +271,6 @@ public:
*/
bool hasOffscreenXineramaStrut() const;
// Decorations <-> Effects
QRect decorationRect() const override;
QRect transparentRect() const override;
bool isClientSideDecorated() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment