Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: reduce repaints amount caused by selection #4889

Merged
merged 8 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
- Dev: Add a compile-time flag `USE_SYSTEM_MINIAUDIO` which can be turned on to use the system miniaudio. (#4867)
- Dev: Update vcpkg to use Qt6. (#4872)
- Dev: Replace `boost::optional` with `std::optional`. (#4877)
- Dev: Improve performance by reducing repaints caused by selections. (#4889)

## 2.4.6

Expand Down
12 changes: 11 additions & 1 deletion src/messages/Selection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct SelectionItem {

bool operator!=(const SelectionItem &b) const
{
return this->operator==(b);
return !this->operator==(b);
}
pajlada marked this conversation as resolved.
Show resolved Hide resolved
};

Expand All @@ -62,6 +62,16 @@ struct Selection {
}
}

bool operator==(const Selection &b) const
{
return this->start == b.start && this->end == b.end;
}

bool operator!=(const Selection &b) const
{
return !this->operator==(b);
}

bool isEmpty() const
{
return this->start == this->end;
Expand Down
46 changes: 14 additions & 32 deletions src/widgets/helper/ChannelView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1091,18 +1091,13 @@ void ChannelView::resizeEvent(QResizeEvent *)
void ChannelView::setSelection(const SelectionItem &start,
const SelectionItem &end)
{
// selections
if (!this->selecting_ && start != end)
auto newSelection = Selection(start, end);
if (this->selection_ != newSelection)
{
// this->messagesAddedSinceSelectionPause_ = 0;

this->selecting_ = true;
// this->pausedBySelection_ = true;
this->selection_ = newSelection;
this->selectionChanged.invoke();
this->update();
}

this->selection_ = Selection(start, end);

this->selectionChanged.invoke();
}

MessageElementFlags ChannelView::getFlags() const
Expand Down Expand Up @@ -1520,13 +1515,10 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
// is selecting
if (this->isLeftMouseDown_)
{
// this->pause(PauseReason::Selecting, 300);
auto index = layout->getSelectionIndex(relativePos);

this->setSelection(this->selection_.start,
SelectionItem(messageIndex, index));

this->queueUpdate();
}

// message under cursor is collapsed
Expand Down Expand Up @@ -1980,6 +1972,15 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
{
return;
}

// Triple-clicking a message selects the whole message
if (foundElement && this->clickTimer_->isActive() &&
(fabsf(distanceBetweenPoints(this->lastDClickPosition_,
event->screenPos())) < 10.f))
kornes marked this conversation as resolved.
Show resolved Hide resolved
{
this->selectWholeMessage(layout.get(), messageIndex);
kornes marked this conversation as resolved.
Show resolved Hide resolved
return;
}
}
else
{
Expand Down Expand Up @@ -2061,15 +2062,6 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)

const MessageLayoutElement *hoverLayoutElement =
layout->getElementAt(relativePos);
// Triple-clicking a message selects the whole message
if (this->clickTimer_->isActive() && this->selecting_)
{
if (fabsf(distanceBetweenPoints(this->lastDClickPosition_,
event->screenPos())) < 10.f)
{
this->selectWholeMessage(layout.get(), messageIndex);
}
}

// handle the click
this->handleMouseClick(event, hoverLayoutElement, layout);
Expand All @@ -2084,16 +2076,6 @@ void ChannelView::handleMouseClick(QMouseEvent *event,
switch (event->button())
{
case Qt::LeftButton: {
if (this->selecting_)
{
// this->pausedBySelection = false;
this->selecting_ = false;
// this->pauseTimeout.stop();
// this->pausedTemporarily = false;

this->queueLayout();
}

if (hoveredElement == nullptr)
{
return;
Expand Down
1 change: 0 additions & 1 deletion src/widgets/helper/ChannelView.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ class ChannelView final : public BaseWidget
} cursors_;

Selection selection_;
bool selecting_ = false;

const Context context_;

Expand Down
Loading