kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Add rpl interface to RadiobuttonGroup.

Browse source
This commit is contained in:
John Preston 2024-02-23 13:24:20 +04:00
parent 1af6140fa3
commit 0c6b2c611d
2 changed files with 66 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ui/widgets/checkbox.cpp
View file

@ -907,11 +907,25 @@ void RadiobuttonGroup::setValue(int value) {
for (const auto button : _buttons) {
button->handleNewGroupValue(_value);
}
if (const auto callback = _changedCallback) {
callback(_value);
const auto guard = weak_from_this();
_changes.fire_copy(value);
if (guard.lock()) {
if (const auto callback = _changedCallback) {
callback(_value);
}
}
}
void RadiobuttonGroup::registerButton(Radiobutton *button) {
if (!base::contains(_buttons, button)) {
_buttons.push_back(button);
}
}
void RadiobuttonGroup::unregisterButton(Radiobutton *button) {
_buttons.erase(ranges::remove(_buttons, button), _buttons.end());
}
Radiobutton::Radiobutton(
QWidget *parent,
const std::shared_ptr<RadiobuttonGroup> &group,
@ -927,7 +941,7 @@ Radiobutton::Radiobutton(
st,
std::make_unique<RadioView>(
radioSt,
(group->hasValue() && group->value() == value))) {
(group->hasValue() && group->current() == value))) {
}
Radiobutton::Radiobutton(
@ -946,7 +960,7 @@ Radiobutton::Radiobutton(
, _value(value) {
using namespace rpl::mappers;
checkbox()->setChecked(group->hasValue() && group->value() == value);
checkbox()->setChecked(group->hasValue() && group->current() == value);
_group->registerButton(this);
checkbox()->checkedChanges(
) | rpl::filter(

85
ui/widgets/checkbox.h
View file

@ -191,9 +191,9 @@ public:
using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
void setClickHandlerFilter(ClickHandlerFilter &&filter);
bool checked() const;
rpl::producer<bool> checkedChanges() const;
rpl::producer<bool> checkedValue() const;
[[nodiscard]] bool checked() const;
[[nodiscard]] rpl::producer<bool> checkedChanges() const;
[[nodiscard]] rpl::producer<bool> checkedValue() const;
enum class NotifyAboutChange {
Notify,
DontNotify,
@ -204,17 +204,17 @@ public:
void finishAnimating();
QMargins getMargins() const override {
[[nodiscard]] QMargins getMargins() const override {
return _st.margin;
}
int naturalWidth() const override;
[[nodiscard]] int naturalWidth() const override;
void updateCheck() {
rtlupdate(checkRect());
}
QRect checkRect() const;
[[nodiscard]] QRect checkRect() const;
not_null<AbstractCheckView*> checkView() const {
[[nodiscard]] not_null<AbstractCheckView*> checkView() const {
return _check.get();
}
@ -257,7 +257,8 @@ private:
class Radiobutton;
class RadiobuttonGroup {
class RadiobuttonGroup
: public std::enable_shared_from_this<RadiobuttonGroup> {
public:
RadiobuttonGroup() = default;
RadiobuttonGroup(int value) : _value(value), _hasValue(true) {
@ -266,29 +267,32 @@ public:
void setChangedCallback(Fn<void(int value)> callback) {
_changedCallback = std::move(callback);
}
[[nodiscard]] rpl::producer<int> changes() const {
return _changes.events();
}
[[nodiscard]] rpl::producer<int> value() const {
return hasValue()
? _changes.events_starting_with_copy(_value)
: changes();
}
bool hasValue() const {
[[nodiscard]] bool hasValue() const {
return _hasValue;
}
int value() const {
[[nodiscard]] int current() const {
return _value;
}
void setValue(int value);
private:
friend class Radiobutton;
void registerButton(Radiobutton *button) {
if (!base::contains(_buttons, button)) {
_buttons.push_back(button);
}
}
void unregisterButton(Radiobutton *button) {
_buttons.erase(std::remove(_buttons.begin(), _buttons.end(), button), _buttons.end());
}
void registerButton(Radiobutton *button);
void unregisterButton(Radiobutton *button);
int _value = 0;
bool _hasValue = false;
Fn<void(int value)> _changedCallback;
rpl::event_stream<int> _changes;
std::vector<Radiobutton*> _buttons;
};
@ -340,35 +344,42 @@ template <typename Enum>
class Radioenum;
template <typename Enum>
class RadioenumGroup {
class RadioenumGroup : public RadiobuttonGroup {
using Parent = RadiobuttonGroup;
[[nodiscard]] static Enum Cast(int value) {
return static_cast<Enum>(value);
}
public:
RadioenumGroup() = default;
RadioenumGroup(Enum value) : _group(static_cast<int>(value)) {
RadioenumGroup(Enum value) : Parent(static_cast<int>(value)) {
}
template <typename Callback>
void setChangedCallback(Callback &&callback) {
_group.setChangedCallback([callback](int value) {
callback(static_cast<Enum>(value));
Parent::setChangedCallback([copy = std::move(callback)](int value) {
copy(Cast(value));
});
}
bool hasValue() const {
return _group.hasValue();
[[nodiscard]] rpl::producer<Enum> changes() const {
return Parent::changes() | rpl::map(Cast);
}
Enum value() const {
return static_cast<Enum>(_group.value());
[[nodiscard]] rpl::producer<Enum> value() const {
return Parent::value() | rpl::map(Cast);
}
[[nodiscard]] Enum current() const {
return Cast(Parent::current());
}
void setValue(Enum value) {
_group.setValue(static_cast<int>(value));
Parent::setValue(static_cast<int>(value));
}
private:
template <typename OtherEnum>
friend class Radioenum;
RadiobuttonGroup _group;
};
template <typename Enum>
@ -382,7 +393,7 @@ public:
const style::Checkbox &st = st::defaultCheckbox)
: Radiobutton(
parent,
std::shared_ptr<RadiobuttonGroup>(group, &group->_group),
group->shared_from_this(),
static_cast<int>(value),
text,
st) {
@ -394,13 +405,13 @@ public:
const QString &text,
const style::Checkbox &st,
std::unique_ptr<AbstractCheckView> check)
: Radiobutton(
parent,
std::shared_ptr<RadiobuttonGroup>(group, &group->_group),
static_cast<int>(value),
text,
st,
std::move(check)) {
: Radiobutton(
parent,
group->shared_from_this(),
static_cast<int>(value),
text,
st,
std::move(check)) {
}
};