1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bradient: Use QWaylandWindow actual window title

Browse Source 
It may include a suffix containing the application name
and is also what's set on the XDG Toplevel, i.e. what
the rest of the environment (task switcher, etc) sees.

This stores the title in QWaylandWindow and adds a
getter to retrieve it.

Pick-to: 6.7
Change-Id: I84f41c68b16b680cdbb5cf656c7078d1e41767d4
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Kai Uwe Broulik 2024-01-04 20:30:33 +01:00
parent b7723f14e6
commit cc5d649c98
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp
View File

@ -142,7 +142,7 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device)
}
// Window title
QString windowTitleText = window()->title();
QString windowTitleText = waylandWindow()->windowTitle();
if (!windowTitleText.isEmpty()) {
if (m_windowTitle.text() != windowTitleText) {
m_windowTitle.setText(windowTitleText);

35
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -362,26 +362,33 @@ void QWaylandWindow::setParent(const QPlatformWindow *parent)
}
}
QString QWaylandWindow::windowTitle() const
{
return mWindowTitle;
}
void QWaylandWindow::setWindowTitle(const QString &title)
{
if (mShellSurface) {
const QString separator = QString::fromUtf8(" \xe2\x80\x94 "); // unicode character U+2014, EM DASH
const QString formatted = formatWindowTitle(title, separator);
const QString separator = QString::fromUtf8(" \xe2\x80\x94 "); // unicode character U+2014, EM DASH
const QString formatted = formatWindowTitle(title, separator);
const int libwaylandMaxBufferSize = 4096;
// Some parts of the buffer is used for metadata, so subtract 100 to be on the safe side.
// Also, QString is in utf-16, which means that in the worst case each character will be
// three bytes when converted to utf-8 (which is what libwayland uses), so divide by three.
const int maxLength = libwaylandMaxBufferSize / 3 - 100;
const int libwaylandMaxBufferSize = 4096;
// Some parts of the buffer is used for metadata, so subtract 100 to be on the safe side.
// Also, QString is in utf-16, which means that in the worst case each character will be
// three bytes when converted to utf-8 (which is what libwayland uses), so divide by three.
const int maxLength = libwaylandMaxBufferSize / 3 - 100;
auto truncated = QStringView{formatted}.left(maxLength);
if (truncated.size() < formatted.size()) {
qCWarning(lcQpaWayland) << "Window titles longer than" << maxLength << "characters are not supported."
<< "Truncating window title (from" << formatted.size() << "chars)";
}
mShellSurface->setTitle(truncated.toString());
auto truncated = QStringView{formatted}.left(maxLength);
if (truncated.size() < formatted.size()) {
qCWarning(lcQpaWayland) << "Window titles longer than" << maxLength << "characters are not supported."
<< "Truncating window title (from" << formatted.size() << "chars)";
}
mWindowTitle = truncated.toString();
if (mShellSurface)
mShellSurface->setTitle(mWindowTitle);
if (mWindowDecorationEnabled && window()->isVisible())
mWindowDecoration->update();
}

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -93,6 +93,7 @@ public:
void setVisible(bool visible) override;
void setParent(const QPlatformWindow *parent) override;
QString windowTitle() const;
void setWindowTitle(const QString &title) override;
inline QIcon windowIcon() const;
@ -311,6 +312,7 @@ protected:
qreal mScale = 1;
QPlatformScreen *mLastReportedScreen = nullptr;
QString mWindowTitle;
QIcon mWindowIcon;
Qt::WindowFlags mFlags;