parent
d6face04c9
commit
b1271c6af5
1 changed files with 12 additions and 1 deletions
|
|
@ -625,6 +625,15 @@ void ComposeControls::init() {
|
||||||
cancelEditMessage();
|
cancelEditMessage();
|
||||||
}, _wrap->lifetime());
|
}, _wrap->lifetime());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HoverEmojiPanelChanges(
|
||||||
|
) | rpl::start_with_next([=] {
|
||||||
|
if (_window->hasTabbedSelectorOwnership()) {
|
||||||
|
createTabbedPanel();
|
||||||
|
} else {
|
||||||
|
setTabbedPanel(nullptr);
|
||||||
|
}
|
||||||
|
}, _wrap->lifetime());
|
||||||
}
|
}
|
||||||
|
|
||||||
void ComposeControls::setTextFromEditingMessage(not_null<HistoryItem*> item) {
|
void ComposeControls::setTextFromEditingMessage(not_null<HistoryItem*> item) {
|
||||||
|
|
@ -822,7 +831,9 @@ void ComposeControls::setTabbedPanel(
|
||||||
std::unique_ptr<ChatHelpers::TabbedPanel> panel) {
|
std::unique_ptr<ChatHelpers::TabbedPanel> panel) {
|
||||||
_tabbedPanel = std::move(panel);
|
_tabbedPanel = std::move(panel);
|
||||||
if (const auto raw = _tabbedPanel.get()) {
|
if (const auto raw = _tabbedPanel.get()) {
|
||||||
_tabbedSelectorToggle->installEventFilter(raw);
|
if (HoverEmojiPanel()) {
|
||||||
|
_tabbedSelectorToggle->installEventFilter(raw);
|
||||||
|
}
|
||||||
_tabbedSelectorToggle->setColorOverrides(nullptr, nullptr, nullptr);
|
_tabbedSelectorToggle->setColorOverrides(nullptr, nullptr, nullptr);
|
||||||
} else {
|
} else {
|
||||||
_tabbedSelectorToggle->setColorOverrides(
|
_tabbedSelectorToggle->setColorOverrides(
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue