kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Make updateGeometry don't need the argument

Browse source
This commit is contained in:
Ilya Fedin 2020-12-12 13:09:03 +04:00 • committed by John Preston
parent 2b91eedcd4
commit 78a666a19d
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View file

@ -359,7 +359,7 @@ OverlayWidget::OverlayWidget()
} else { } else {
setWindowFlags(Qt::FramelessWindowHint); setWindowFlags(Qt::FramelessWindowHint);
} }
updateGeometry(QApplication::primaryScreen()->geometry()); updateGeometry();
setAttribute(Qt::WA_NoSystemBackground, true); setAttribute(Qt::WA_NoSystemBackground, true);
setAttribute(Qt::WA_TranslucentBackground, true); setAttribute(Qt::WA_TranslucentBackground, true);
setMouseTracking(true); setMouseTracking(true);
@ -453,8 +453,11 @@ void OverlayWidget::moveToScreen() {
} }
} }
void OverlayWidget::updateGeometry(const QRect &rect) { void OverlayWidget::updateGeometry() {
setGeometry(rect); const auto screen = windowHandle() && windowHandle()->screen()
? windowHandle()->screen()
: QApplication::primaryScreen();
setGeometry(screen->geometry());
auto navSkip = 2 * st::mediaviewControlMargin + st::mediaviewControlSize; auto navSkip = 2 * st::mediaviewControlMargin + st::mediaviewControlSize;
_closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin, st::mediaviewControlSize, st::mediaviewControlSize); _closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin, st::mediaviewControlSize, st::mediaviewControlSize);
@ -1313,21 +1316,18 @@ void OverlayWidget::onScreenResized(int screen) {
&& windowHandle()->screen() && windowHandle()->screen()
&& changed && changed
&& windowHandle()->screen() == changed) { && windowHandle()->screen() == changed) {
updateGeometry(changed->geometry()); updateGeometry();
} }
} }
void OverlayWidget::handleVisibleChanged(bool visible) { void OverlayWidget::handleVisibleChanged(bool visible) {
if (visible) { if (visible) {
const auto screen = windowHandle()->screen() updateGeometry();
? windowHandle()->screen()
: QApplication::primaryScreen();
updateGeometry(screen->geometry());
} }
} }
void OverlayWidget::handleScreenChanged(QScreen *screen) { void OverlayWidget::handleScreenChanged(QScreen *screen) {
updateGeometry(screen->geometry()); updateGeometry();
} }
void OverlayWidget::onToMessage() { void OverlayWidget::onToMessage() {

2
Telegram/SourceFiles/media/view/media_view_overlay_widget.h
View file

@ -209,10 +209,10 @@ private:
void updateOver(QPoint mpos); void updateOver(QPoint mpos);
void moveToScreen(); void moveToScreen();
void updateGeometry();
bool moveToNext(int delta); bool moveToNext(int delta);
void preloadData(int delta); void preloadData(int delta);
void updateGeometry(const QRect &rect);
void handleVisibleChanged(bool visible); void handleVisibleChanged(bool visible);
void handleScreenChanged(QScreen *screen); void handleScreenChanged(QScreen *screen);