chatterino2
Code Issues

ChatWidgetView -> ChannelView, added Emote Picker

Browse Source
This commit is contained in:
fourtf
2017-09-16 00:05:06 +02:00
parent 84c23a5d00
commit c7b3480aaf
37 changed files with 532 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/chatwidgetinput.cpp
+6 -3
View File
@@ -13,9 +13,10 @@
namespace chatterino {
namespace widgets {
ChatWidgetInput::ChatWidgetInput(ChatWidget *_chatWidget)
ChatWidgetInput::ChatWidgetInput(ChatWidget *_chatWidget, EmoteManager &emoteManager)
: BaseWidget(_chatWidget)
, chatWidget(_chatWidget)
, emoteManager(emoteManager)
, emotesLabel(this)
{
this->setMaximumHeight(150);
@@ -46,10 +47,12 @@ ChatWidgetInput::ChatWidgetInput(ChatWidget *_chatWidget)
connect(&this->emotesLabel, &ChatWidgetHeaderButton::clicked, [this] {
if (this->emotePopup == nullptr) {
this->emotePopup = new EmotePopup();
this->emotePopup = new EmotePopup(this->colorScheme, this->emoteManager);
}
this->emotePopup->show(); //
this->emotePopup->resize(300, 500);
this->emotePopup->loadChannel(this->chatWidget->getChannel());
this->emotePopup->show();
});
connect(&textInput, &ResizingTextEdit::textChanged, this, &ChatWidgetInput::editTextChanged);