void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use username in notifications if available.

Browse source
This commit is contained in:
John Preston 2020-06-19 21:26:29 +04:00
parent 3bb352e0e5
commit 4a8d297df3
4 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/platform/mac/window_title_mac.h
View file

@ -17,7 +17,7 @@ namespace Platform {
class MainWindow; class MainWindow;
class TitleWidget : public Window::TitleWidget, private base::Subscriber { class TitleWidget : public Window::TitleWidget {
public: public:
TitleWidget(MainWindow *parent, int height); TitleWidget(MainWindow *parent, int height);

19
Telegram/SourceFiles/platform/win/window_title_win.cpp
View file

@ -47,7 +47,11 @@ TitleWidget::TitleWidget(QWidget *parent)
} }
void TitleWidget::init() { void TitleWidget::init() {
connect(window()->windowHandle(), SIGNAL(windowStateChanged(Qt::WindowState)), this, SLOT(onWindowStateChanged(Qt::WindowState))); connect(
window()->windowHandle(),
&QWindow::windowStateChanged,
this,
[=](Qt::WindowState state) { windowStateChanged(state); });
_maximizedState = (window()->windowState() & Qt::WindowMaximized); _maximizedState = (window()->windowState() & Qt::WindowMaximized);
_activeState = isActiveWindow(); _activeState = isActiveWindow();
updateButtonsState(); updateButtonsState();
@ -74,15 +78,12 @@ void TitleWidget::resizeEvent(QResizeEvent *e) {
_shadow->setGeometry(0, height() - st::lineWidth, width(), st::lineWidth); _shadow->setGeometry(0, height() - st::lineWidth, width(), st::lineWidth);
} }
void TitleWidget::updateControlsVisibility() { void TitleWidget::windowStateChanged(Qt::WindowState state) {
updateControlsPosition(); if (state == Qt::WindowMinimized) {
update(); return;
} }
void TitleWidget::onWindowStateChanged(Qt::WindowState state) { const auto maximized = (state == Qt::WindowMaximized);
if (state == Qt::WindowMinimized) return;
auto maximized = (state == Qt::WindowMaximized);
if (_maximizedState != maximized) { if (_maximizedState != maximized) {
_maximizedState = maximized; _maximizedState = maximized;
updateButtonsState(); updateButtonsState();

12
Telegram/SourceFiles/platform/win/window_title_win.h
View file

@ -30,25 +30,21 @@ void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palet
namespace Platform { namespace Platform {
class TitleWidget : public Window::TitleWidget, private base::Subscriber { class TitleWidget : public Window::TitleWidget {
Q_OBJECT
public: public:
TitleWidget(QWidget *parent); TitleWidget(QWidget *parent);
void init() override; void init() override;
Window::HitTestResult hitTest(const QPoint &p) const override; [[nodiscard]] Window::HitTestResult hitTest(
const QPoint &p) const override;
public slots:
void onWindowStateChanged(Qt::WindowState state = Qt::WindowNoState);
void updateControlsVisibility();
protected: protected:
void paintEvent(QPaintEvent *e) override; void paintEvent(QPaintEvent *e) override;
void resizeEvent(QResizeEvent *e) override; void resizeEvent(QResizeEvent *e) override;
private: private:
void windowStateChanged(Qt::WindowState state = Qt::WindowNoState);
void updateButtonsState(); void updateButtonsState();
void updateControlsPosition(); void updateControlsPosition();

6
Telegram/SourceFiles/window/notifications_manager.cpp
View file

@ -552,7 +552,11 @@ QString Manager::addTargetAccountName(
const QString &title, const QString &title,
not_null<Main::Session*> session) { not_null<Main::Session*> session) {
return (Core::App().domain().accounts().size() > 1) return (Core::App().domain().accounts().size() > 1)
? (title + accountNameSeparator() + session->user()->name) ? (title
+ accountNameSeparator()
+ (session->user()->username.isEmpty()
? session->user()->name
: session->user()->username))
: title; : title;
} }