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

Fix mouse input in layers in call window.

Browse source
This commit is contained in:
John Preston 2021-08-11 11:06:34 +03:00
parent fff42a664c
commit 46885b7f9f
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Telegram/SourceFiles/calls/calls_panel.cpp
View file

@ -77,6 +77,9 @@ Panel::Panel(not_null<Call*> call)
, _mute(widget(), st::callMicrophoneMute, &st::callMicrophoneUnmute) , _mute(widget(), st::callMicrophoneMute, &st::callMicrophoneUnmute)
, _name(widget(), st::callName) , _name(widget(), st::callName)
, _status(widget(), st::callStatus) { , _status(widget(), st::callStatus) {
_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
_layerBg->setHideByBackgroundClick(true);
_decline->setDuration(st::callPanelDuration); _decline->setDuration(st::callPanelDuration);
_decline->entity()->setText(tr::lng_call_decline()); _decline->entity()->setText(tr::lng_call_decline());
_cancel->setDuration(st::callPanelDuration); _cancel->setDuration(st::callPanelDuration);
@ -158,9 +161,13 @@ void Panel::initWindow() {
_answerHangupRedial->height()).contains(widgetPoint) _answerHangupRedial->height()).contains(widgetPoint)
|| (!_outgoingPreviewInBody || (!_outgoingPreviewInBody
&& _outgoingVideoBubble->geometry().contains(widgetPoint)); && _outgoingVideoBubble->geometry().contains(widgetPoint));
return inControls if (inControls) {
? Flag::None return Flag::None | Flag(0);
: (Flag::Move | Flag::FullScreen); }
const auto shown = _layerBg->topShownLayer();
return (!shown || !shown->geometry().contains(widgetPoint))
? (Flag::Move | Flag::FullScreen)
: Flag::None;
}); });
// Don't do that, it looks awful :( // Don't do that, it looks awful :(

9
Telegram/SourceFiles/calls/group/calls_group_panel.cpp
View file

@ -268,11 +268,16 @@ void Panel::initWindow() {
0, 0,
widget()->width(), widget()->width(),
st::groupCallMembersTop); st::groupCallMembersTop);
return (titleRect.contains(widgetPoint) const auto moveable = (titleRect.contains(widgetPoint)
&& (!_menuToggle || !_menuToggle->geometry().contains(widgetPoint)) && (!_menuToggle || !_menuToggle->geometry().contains(widgetPoint))
&& (!_menu || !_menu->geometry().contains(widgetPoint)) && (!_menu || !_menu->geometry().contains(widgetPoint))
&& (!_recordingMark || !_recordingMark->geometry().contains(widgetPoint)) && (!_recordingMark || !_recordingMark->geometry().contains(widgetPoint))
&& (!_joinAsToggle || !_joinAsToggle->geometry().contains(widgetPoint))) && (!_joinAsToggle || !_joinAsToggle->geometry().contains(widgetPoint)));
if (!moveable) {
return (Flag::None | Flag(0));
}
const auto shown = _layerBg->topShownLayer();
return (!shown || !shown->geometry().contains(widgetPoint))
? (Flag::Move | Flag::Maximize) ? (Flag::Move | Flag::Maximize)
: Flag::None; : Flag::None;
}); });

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 024f6fc1a970778a5a6393a8fcd847fd52760097 Subproject commit 1b590f9e16eb9571a039f072d6fea66c607e419f