procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Use RpWidget::screenValue

Browse source
This commit is contained in:
Ilya Fedin 2024-06-21 15:07:37 +04:00 committed by John Preston
parent 5180e0ec57
commit 006d6fe2c0
5 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -633,10 +633,10 @@ OverlayWidget::OverlayWidget()
_widget->setMouseTracking(true);
_window->createWinId();
QObject::connect(
window(),
&QWindow::screenChanged,
[=](QScreen *screen) { handleScreenChanged(screen); });
_window->screenValue(
) | rpl::skip(1) | rpl::start_with_next([=](not_null<QScreen*> screen) {
handleScreenChanged(screen);
}, lifetime());
subscribeToScreenGeometry();
updateGeometry();
updateControlsGeometry();
@ -2315,7 +2315,7 @@ void OverlayWidget::dropdownHidden() {
}
}
void OverlayWidget::handleScreenChanged(QScreen *screen) {
void OverlayWidget::handleScreenChanged(not_null<QScreen*> screen) {
subscribeToScreenGeometry();
if (isHidden()) {
return;

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

@ -303,7 +303,7 @@ private:
bool moveToNext(int delta);
void preloadData(int delta);
void handleScreenChanged(QScreen *screen);
void handleScreenChanged(not_null<QScreen*> screen);
[[nodiscard]] bool computeSaveButtonVisible() const;
void checkForSaveLoaded();

12
Telegram/SourceFiles/media/view/media_view_pip.cpp
View file

@ -361,12 +361,10 @@ void PipPanel::init() {
Ui::Platform::ClearTransientParent(widget());
}, rp()->lifetime());
QObject::connect(
widget()->windowHandle(),
&QWindow::screenChanged,
[=](QScreen *screen) {
handleScreenChanged(screen);
});
rp()->screenValue(
) | rpl::skip(1) | rpl::start_with_next([=](not_null<QScreen*> screen) {
handleScreenChanged(screen);
}, rp()->lifetime());
if (Platform::IsWayland()) {
rp()->sizeValue(
@ -637,7 +635,7 @@ void PipPanel::handleWaylandResize(QSize size) {
_inHandleWaylandResize = false;
}
void PipPanel::handleScreenChanged(QScreen *screen) {
void PipPanel::handleScreenChanged(not_null<QScreen*> screen) {
const auto screenGeometry = screen->availableGeometry();
const auto minimalSize = _ratio.scaled(
st::pipMinimalSize,

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

@ -77,7 +77,7 @@ public:
[[nodiscard]] bool dragging() const;
void handleWaylandResize(QSize size);
void handleScreenChanged(QScreen *screen);
void handleScreenChanged(not_null<QScreen*> screen);
void handleMousePress(QPoint position, Qt::MouseButton button);
void handleMouseRelease(QPoint position, Qt::MouseButton button);
void handleMouseMove(QPoint position);

18
Telegram/SourceFiles/window/window_main_menu.cpp
View file

@ -957,21 +957,15 @@ void MainMenu::drawName(Painter &p) {
}
void MainMenu::initResetScaleButton() {
if (!window() || !window()->windowHandle()) {
return;
}
const auto handle = window()->windowHandle();
rpl::single(
handle->screen()
) | rpl::then(
base::qt_signal_producer(handle, &QWindow::screenChanged)
) | rpl::filter([](QScreen *screen) {
return screen != nullptr;
}) | rpl::map([](QScreen * screen) {
_controller->widget()->screenValue(
) | rpl::map([](not_null<QScreen*> screen) {
return rpl::single(
screen->availableGeometry()
) | rpl::then(
base::qt_signal_producer(screen, &QScreen::availableGeometryChanged)
base::qt_signal_producer(
screen.get(),
&QScreen::availableGeometryChanged
)
);
}) | rpl::flatten_latest(
) | rpl::map([](QRect available) {