procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix proxy icon doubling. 

Fixes #4666.
This commit is contained in:
John Preston 2018-05-10 13:24:40 +03:00
parent 4d84781a65
commit 296e009808
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/window/window_connecting_widget.cpp
View File

@ -205,10 +205,9 @@ base::unique_qptr<ConnectingWidget> ConnectingWidget::CreateDefaultWidget(
const auto weak = result.get(); const auto weak = result.get();
rpl::combine( rpl::combine(
result->visibility(), result->visibility(),
parent->heightValue(), parent->heightValue()
std::move(shown) ) | rpl::start_with_next([=](float64 visible, int height) {
) | rpl::start_with_next([=](float64 visible, int height, bool shown) { const auto hidden = (visible == 0.);
const auto hidden = (visible == 0.) || !shown;
if (weak->isHidden() != hidden) { if (weak->isHidden() != hidden) {
weak->setVisible(!hidden); weak->setVisible(!hidden);
} }
@ -218,6 +217,11 @@ base::unique_qptr<ConnectingWidget> ConnectingWidget::CreateDefaultWidget(
height - weak->height(), height - weak->height(),
visible)); visible));
}, weak->lifetime()); }, weak->lifetime());
std::move(
shown
) | rpl::start_with_next([=](bool shown) {
weak->setForceHidden(!shown);
}, weak->lifetime());
result->finishAnimating(); result->finishAnimating();
return result; return result;
} }