kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Replaced timer for dragging scroll in Ui::BoxContent with manager.

Browse source
This commit is contained in:
23rd 2022-03-14 18:23:08 +03:00
parent d27e4803a1
commit 2779a7d036
2 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ui/layers/box_content.cpp
View file

@ -98,6 +98,12 @@ void BoxContent::finishScrollCreate() {
updateInnerVisibleTopBottom(); updateInnerVisibleTopBottom();
updateShadowsVisibility(); updateShadowsVisibility();
}, lifetime()); }, lifetime());
_draggingScroll.scrolls(
) | rpl::start_with_next([=](int delta) {
if (_scroll) {
_scroll->scrollToY(_scroll->scrollTop() + delta);
}
}, lifetime());
} }
void BoxContent::scrollToWidget(not_null<QWidget*> widget) { void BoxContent::scrollToWidget(not_null<QWidget*> widget) {
@ -117,24 +123,7 @@ void BoxContent::scrollToY(int top, int bottom) {
} }
void BoxContent::scrollByDraggingDelta(int delta) { void BoxContent::scrollByDraggingDelta(int delta) {
_draggingScrollDelta = _scroll ? delta : 0; _draggingScroll.checkDeltaScroll(_scroll ? delta : 0);
if (_draggingScrollDelta) {
if (!_draggingScrollTimer) {
_draggingScrollTimer = std::make_unique<base::Timer>([=] {
draggingScrollTimerCallback();
});
}
_draggingScrollTimer->callEach(15);
} else {
_draggingScrollTimer = nullptr;
}
}
void BoxContent::draggingScrollTimerCallback() {
const auto delta = (_draggingScrollDelta > 0)
? qMin(_draggingScrollDelta * 3 / 20 + 1, int32(kMaxScrollSpeed))
: qMax(_draggingScrollDelta * 3 / 20 - 1, -int32(kMaxScrollSpeed));
_scroll->scrollToY(_scroll->scrollTop() + delta);
} }
void BoxContent::updateInnerVisibleTopBottom() { void BoxContent::updateInnerVisibleTopBottom() {

6
ui/layers/box_content.h
View file

@ -8,6 +8,7 @@
#include "base/unique_qptr.h" #include "base/unique_qptr.h"
#include "base/flags.h" #include "base/flags.h"
#include "ui/dragging_scroll_manager.h"
#include "ui/wrap/padding_wrap.h" #include "ui/wrap/padding_wrap.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/layers/layer_widget.h" #include "ui/layers/layer_widget.h"
@ -287,8 +288,6 @@ private:
void updateShadowsVisibility(); void updateShadowsVisibility();
object_ptr<TWidget> doTakeInnerWidget(); object_ptr<TWidget> doTakeInnerWidget();
void draggingScrollTimerCallback();
BoxContentDelegate *_delegate = nullptr; BoxContentDelegate *_delegate = nullptr;
bool _preparing = false; bool _preparing = false;
@ -300,8 +299,7 @@ private:
object_ptr<FadeShadow> _topShadow = { nullptr }; object_ptr<FadeShadow> _topShadow = { nullptr };
object_ptr<FadeShadow> _bottomShadow = { nullptr }; object_ptr<FadeShadow> _bottomShadow = { nullptr };
std::unique_ptr<base::Timer> _draggingScrollTimer; Ui::DraggingScrollManager _draggingScroll;
int _draggingScrollDelta = 0;
rpl::event_stream<> _boxClosingStream; rpl::event_stream<> _boxClosingStream;