kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fixed drawing of long window titles on macOS.

Browse source
This commit is contained in:
23rd 2022-12-04 18:47:00 +03:00
parent 113b289f7f
commit 22ceaae4ed
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ui/platform/mac/ui_window_mac.mm
View file

@ -320,6 +320,7 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
updateCustomTitleVisibility(); updateCustomTitleVisibility();
} }
init(); init();
_title->setControlsRect(_private->controlsRect());
} }
WindowHelper::~WindowHelper() { WindowHelper::~WindowHelper() {

3
ui/platform/mac/ui_window_title_mac.h
View file

@ -28,6 +28,7 @@ public:
void setText(const QString &text); void setText(const QString &text);
void setStyle(const style::WindowTitle &st); void setStyle(const style::WindowTitle &st);
void setControlsRect(const QRect &rect);
[[nodiscard]] QString text() const; [[nodiscard]] QString text() const;
[[nodiscard]] bool shouldBeHidden() const; [[nodiscard]] bool shouldBeHidden() const;
@ -44,6 +45,8 @@ private:
not_null<const style::WindowTitle*> _st; not_null<const style::WindowTitle*> _st;
object_ptr<Ui::PlainShadow> _shadow; object_ptr<Ui::PlainShadow> _shadow;
QString _text; QString _text;
int _textWidth = 0;
int _controlsRight = 0;
QFont _font; QFont _font;
}; };

17
ui/platform/mac/ui_window_title_mac.mm
View file

@ -30,6 +30,7 @@ TitleWidget::TitleWidget(not_null<RpWidget*> parent, int height)
void TitleWidget::setText(const QString &text) { void TitleWidget::setText(const QString &text) {
if (_text != text) { if (_text != text) {
_text = text; _text = text;
_textWidth = QFontMetrics(_font).horizontalAdvance(_text);
update(); update();
} }
} }
@ -39,6 +40,10 @@ void TitleWidget::setStyle(const style::WindowTitle &st) {
update(); update();
} }
void TitleWidget::setControlsRect(const QRect &rect) {
_controlsRight = rect.left() * 2 + rect.width();
}
bool TitleWidget::shouldBeHidden() const { bool TitleWidget::shouldBeHidden() const {
return !_st->height; return !_st->height;
} }
@ -94,7 +99,17 @@ void TitleWidget::paintEvent(QPaintEvent *e) {
p.setFont(_font); p.setFont(_font);
p.setPen(active ? _st->fgActive : _st->fg); p.setPen(active ? _st->fgActive : _st->fg);
p.drawText(rect(), _text, style::al_center);
if ((width() - _controlsRight * 2) < _textWidth) {
const auto elided = QFontMetrics(_font).elidedText(
_text,
Qt::ElideRight,
width() - _controlsRight);
const auto padding = QMargins(_controlsRight, 0, 0, 0);
p.drawText(rect() - padding, elided, style::al_left);
} else {
p.drawText(rect(), _text, style::al_center);
}
} }
void TitleWidget::resizeEvent(QResizeEvent *e) { void TitleWidget::resizeEvent(QResizeEvent *e) {