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

WindowsQPA: Add default window title to custom titlebar

Browse Source 
In case that no window title was provided use the
QCoreApplication::applicationName when Qt::WindowTitleHint was provided.

Fixes: QTBUG-133942
Change-Id: Ieeff0ba97bd996225c6f83f691fc1c149e3d7172
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 5d8c3a598588a950aa8dbab7a72cc5e6de7bd3a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Wladimir Leuschner 2025-03-11 15:43:25 +01:00 committed by Qt Cherry-pick Bot
parent e897b68239
commit a3fb8e9abc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -3487,7 +3487,7 @@ void QWindowsWindow::updateCustomTitlebar()
const QBrush closeButtonBrush(QColor(0xC4, 0x2B, 0x1C, 255));
const QBrush minMaxButtonBrush = QBrush(isDarkmode ? QColor(0xFF, 0xFF, 0xFF, 0x40) : QColor(0x00, 0x00, 0x00, 0x20));
const QBrush titleBarBackgroundColor = QBrush(isDarkmode ? QColor(0x1F, 0x1F, 0x1F, 0xFF) : QColor(0xF3, 0xF3, 0xF3, 0xFF));
const QPen textPen = QPen(isDarkmode ? QColor(255, 255, 255, 255) : QColor(0, 0, 0, 255));
const QPen textPen = QPen(isDarkmode ? QColor(0xFF, 0xFF, 0xFD, 0xFF) : QColor(0x00, 0x00, 0x00, 0xFF));
QImage image(windowWidth, titleBarHeight, QImage::Format_ARGB32);
QPainter p(&image);
@ -3543,7 +3543,8 @@ void QWindowsWindow::updateCustomTitlebar()
titleFont.setWeight(QFont::Thin);
titleFont.setHintingPreference(QFont::PreferFullHinting);
p.setFont(titleFont);
p.drawText(titleRect, wnd->title(), QTextOption(Qt::AlignVCenter));
const QString title = wnd->title().isEmpty() ? qApp->applicationName() : wnd->title();
p.drawText(titleRect, title, QTextOption(Qt::AlignVCenter));
}
int buttons = 1;