noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

improved code style

Browse source
This commit is contained in:
fourtf 2018-06-13 03:58:52 +02:00
parent 394009dda8
commit 73a067f42f
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/widgets/helper/channelview.cpp
View file

@ -65,12 +65,15 @@ ChannelView::ChannelView(BaseWidget *parent)
this->queueUpdate(); this->queueUpdate();
}); });
this->scrollBar_.getDesiredValueChanged().connect(
[this] { this->pausedByScrollingUp_ = !this->scrollBar_.isAtBottom(); });
this->connections_.push_back(app->windows->repaintGifs.connect([&] { this->connections_.push_back(app->windows->repaintGifs.connect([&] {
this->queueUpdate(); // this->queueUpdate(); //
})); }));
this->connections_.push_back(app->windows->layout.connect([&](Channel *channel) { this->connections_.push_back(app->windows->layout.connect([&](Channel *channel) {
if (channel == nullptr || this->channel.get() == channel) { if (channel == nullptr || this->channel_.get() == channel) {
this->layoutMessages(); this->layoutMessages();
} }
})); }));
@ -84,7 +87,7 @@ ChannelView::ChannelView(BaseWidget *parent)
this->layoutMessages(); // this->layoutMessages(); //
})); }));
QObject::connect(goToBottom, &RippleEffectLabel::clicked, this, [=] { QObject::connect(this->goToBottom_, &RippleEffectLabel::clicked, this, [=] {
QTimer::singleShot(180, [=] { QTimer::singleShot(180, [=] {
this->scrollBar_.scrollToBottom( this->scrollBar_.scrollToBottom(
app->settings->enableSmoothScrollingNewMessages.getValue()); app->settings->enableSmoothScrollingNewMessages.getValue());
@ -1202,7 +1205,7 @@ bool ChannelView::tryGetMessageAt(QPoint p, std::shared_ptr<messages::MessageLay
int ChannelView::getLayoutWidth() const int ChannelView::getLayoutWidth() const
{ {
if (this->scrollBar.isVisible()) if (this->scrollBar_.isVisible())
return int(this->width() - 8 * this->getScale()); return int(this->width() - 8 * this->getScale());
return this->width(); return this->width();

2
src/widgets/helper/channelview.hpp
View file

@ -150,6 +150,8 @@ private:
std::unordered_set<std::shared_ptr<messages::MessageLayout>> messagesOnScreen_; std::unordered_set<std::shared_ptr<messages::MessageLayout>> messagesOnScreen_;
int getLayoutWidth() const;
private slots: private slots:
void wordFlagsChanged() void wordFlagsChanged()
{ {