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

Simplify PipPanel::handleWaylandResize

Browse source
This commit is contained in:
Ilya Fedin 2024-06-21 17:06:02 +04:00 committed by John Preston
parent eea50ed6b0
commit c1bc7e6ab1
2 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/application.h"
#include "base/platform/base_platform_info.h"
#include "base/power_save_blocker.h"
#include "base/event_filter.h"
#include "ui/platform/ui_platform_utility.h"
#include "ui/platform/ui_platform_window_title.h"
#include "ui/widgets/buttons.h"
@ -351,7 +350,6 @@ void PipPanel::init() {
widget()->setMouseTracking(true);
widget()->resize(0, 0);
widget()->hide();
widget()->createWinId();
rp()->shownValue(
) | rpl::filter([=](bool shown) {
@ -368,30 +366,9 @@ void PipPanel::init() {
if (Platform::IsWayland()) {
rp()->sizeValue(
) | rpl::start_with_next([=](QSize size) {
) | rpl::skip(1) | rpl::start_with_next([=](QSize size) {
handleWaylandResize(size);
}, rp()->lifetime());
base::install_event_filter(widget(), [=](not_null<QEvent*> event) {
if (event->type() == QEvent::Resize && _inHandleWaylandResize) {
return base::EventFilterResult::Cancel;
}
return base::EventFilterResult::Continue;
});
base::install_event_filter(widget()->windowHandle(), [=](not_null<QEvent*> event) {
if (event->type() == QEvent::Resize) {
if (_inHandleWaylandResize) {
return base::EventFilterResult::Cancel;
}
const auto newSize = static_cast<QResizeEvent*>(event.get())->size();
if (_suggestedWaylandSize == newSize) {
handleWaylandResize(newSize);
return base::EventFilterResult::Cancel;
}
}
return base::EventFilterResult::Continue;
});
}
}
@ -610,8 +587,10 @@ void PipPanel::setGeometry(QRect geometry) {
}
void PipPanel::handleWaylandResize(QSize size) {
if (_inHandleWaylandResize) {
return;
}
_inHandleWaylandResize = true;
_suggestedWaylandSize = size;
// Apply aspect ratio.
const auto max = std::max(size.width(), size.height());
@ -632,6 +611,8 @@ void PipPanel::handleWaylandResize(QSize size) {
: scaled;
widget()->resize(normalized);
QResizeEvent e(normalized, size);
QCoreApplication::sendEvent(widget()->windowHandle(), &e);
_inHandleWaylandResize = false;
}

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

@ -106,7 +106,6 @@ private:
bool _useTransparency = true;
bool _dragDisabled = false;
bool _inHandleWaylandResize = false;
QSize _suggestedWaylandSize;
style::margins _padding;
RectPart _overState = RectPart();