Skip to content

Fix window borders #70

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

Merged
merged 1 commit into from
Jun 18, 2024
Merged

Fix window borders #70

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
32 changes: 13 additions & 19 deletions src/qadwaitadecorations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ static constexpr int ceCornerRadius = 12;
static constexpr int ceShadowsWidth = 10;
static constexpr int ceTitlebarHeight = 38;
static constexpr int ceWindowBorderWidth = 1;
static constexpr qreal ceTitlebarSeperatorWidth = 0.5;

static QMap<QAdwaitaDecorations::ButtonIcon, QString> buttonMap = {
{ QAdwaitaDecorations::CloseIcon, QStringLiteral("window-close-symbolic") },
Expand Down Expand Up @@ -373,6 +372,7 @@ void QAdwaitaDecorations::paint(QPaintDevice *device)
#else
const Qt::WindowStates windowStates = window()->windowStates();
const bool active = window()->handle()->isActive();
const bool tiled = false;
#endif
const bool maximized = windowStates & Qt::WindowMaximized;

Expand Down Expand Up @@ -453,34 +453,28 @@ void QAdwaitaDecorations::paint(QPaintDevice *device)
// Titlebar and window border
{
QPainterPath path;
const int titleBarWidth = surfaceRect.width() - margins().left() - margins().right();
const int borderRectHeight = surfaceRect.height() - margins().top() - margins().bottom();

#ifdef HAS_QT6_SUPPORT
if (maximized || tiled)
const QPoint topLeft = { margins(ShadowsOnly).left(), margins(ShadowsOnly).top() };
const int titleBarWidth =
surfaceRect.width() - margins(ShadowsOnly).left() - margins(ShadowsOnly).right();
#else
if (maximized)
const QPoint topLeft = { 0, 0 };
const int titleBarWidth = surfaceRect.width();
#endif
const int borderRectHeight = surfaceRect.height() - margins().top() - margins().bottom();

if (maximized || tiled)
path.addRect(margins().left(), margins().bottom(), titleBarWidth, margins().top());
else
path.addRoundedRect(margins().left(), margins().bottom(), titleBarWidth,
margins().top() + ceCornerRadius, ceCornerRadius, ceCornerRadius);
path.addRoundedRect(
QRectF(topLeft, QSizeF(titleBarWidth, margins().top() + ceCornerRadius)),
ceCornerRadius, ceCornerRadius);

p.save();
p.setPen(borderColor);
p.fillPath(path.simplified(), backgroundColor);
p.drawPath(path);
p.drawRect(margins().left(), margins().top(), titleBarWidth, borderRectHeight);
p.restore();
}

// Titlebar separator
{
p.save();
p.setPen(active ? m_colors[Border] : m_colors[BorderInactive]);
p.drawLine(QLineF(margins().left(), margins().top() - ceTitlebarSeperatorWidth,
surfaceRect.width() - margins().right(),
margins().top() - ceTitlebarSeperatorWidth));
p.drawRect(topLeft.x(), margins().top(), titleBarWidth, borderRectHeight);
p.restore();
}

Expand Down