From 1c90ca9087a844a5de77002bef129653ebf6acff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 11 Nov 2014 10:49:10 +0100 Subject: [PATCH] [aurorae] Decoration sets borders using QMargins --- clients/aurorae/src/aurorae.cpp | 2 +- clients/aurorae/src/decorationoptions.cpp | 5 +++++ clients/aurorae/src/decorationoptions.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp index 84aeb51304..2e0f7951ff 100644 --- a/clients/aurorae/src/aurorae.cpp +++ b/clients/aurorae/src/aurorae.cpp @@ -388,7 +388,7 @@ void Decoration::updateBorders() if (!b) { return; } - setBorders(b->left(), b->right(), b->top(), b->bottom()); + setBorders(*b); } void Decoration::paint(QPainter *painter, const QRegion &repaintRegion) diff --git a/clients/aurorae/src/decorationoptions.cpp b/clients/aurorae/src/decorationoptions.cpp index 14d235241d..446a022a11 100644 --- a/clients/aurorae/src/decorationoptions.cpp +++ b/clients/aurorae/src/decorationoptions.cpp @@ -246,6 +246,11 @@ void Borders::setTitle(int value) setTop(value); } +Borders::operator QMargins() const +{ + return QMargins(m_left, m_top, m_right, m_bottom); +} + } // namespace #include "decorationoptions.moc" diff --git a/clients/aurorae/src/decorationoptions.h b/clients/aurorae/src/decorationoptions.h index cf3f5f496e..cfa699e68c 100644 --- a/clients/aurorae/src/decorationoptions.h +++ b/clients/aurorae/src/decorationoptions.h @@ -263,6 +263,8 @@ public: void setTop(int top); void setBottom(int bottom); + operator QMargins() const; + public Q_SLOTS: /** * Sets all four borders to @p value.