Fix build with some headers includes.
This commit is contained in:
parent
af105b377c
commit
372c576127
4 changed files with 6 additions and 2 deletions
|
|
@ -682,6 +682,8 @@ SettingsButton::SettingsButton(
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SettingsButton::~SettingsButton() = default;
|
||||||
|
|
||||||
SettingsButton *SettingsButton::toggleOn(rpl::producer<bool> &&toggled) {
|
SettingsButton *SettingsButton::toggleOn(rpl::producer<bool> &&toggled) {
|
||||||
Expects(_toggle == nullptr);
|
Expects(_toggle == nullptr);
|
||||||
_toggle = std::make_unique<Ui::ToggleView>(
|
_toggle = std::make_unique<Ui::ToggleView>(
|
||||||
|
|
|
||||||
|
|
@ -254,6 +254,7 @@ public:
|
||||||
QWidget *parent,
|
QWidget *parent,
|
||||||
rpl::producer<QString> &&text,
|
rpl::producer<QString> &&text,
|
||||||
const style::SettingsButton &st);
|
const style::SettingsButton &st);
|
||||||
|
~SettingsButton();
|
||||||
|
|
||||||
SettingsButton *toggleOn(rpl::producer<bool> &&toggled);
|
SettingsButton *toggleOn(rpl::producer<bool> &&toggled);
|
||||||
bool toggled() const;
|
bool toggled() const;
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ Toggle::Toggle(
|
||||||
, _toggleShift(st.itemToggleShift)
|
, _toggleShift(st.itemToggleShift)
|
||||||
, _itemToggle(st.itemToggle)
|
, _itemToggle(st.itemToggle)
|
||||||
, _itemToggleOver(st.itemToggleOver) {
|
, _itemToggleOver(st.itemToggleOver) {
|
||||||
|
|
||||||
const auto processAction = [=] {
|
const auto processAction = [=] {
|
||||||
if (!action()->isCheckable()) {
|
if (!action()->isCheckable()) {
|
||||||
_toggle.reset();
|
_toggle.reset();
|
||||||
|
|
@ -52,9 +51,10 @@ Toggle::Toggle(
|
||||||
}
|
}
|
||||||
_toggle->setStyle(data.selected ? _itemToggleOver : _itemToggle);
|
_toggle->setStyle(data.selected ? _itemToggleOver : _itemToggle);
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Toggle::~Toggle() = default;
|
||||||
|
|
||||||
void Toggle::paintEvent(QPaintEvent *e) {
|
void Toggle::paintEvent(QPaintEvent *e) {
|
||||||
Action::paintEvent(e);
|
Action::paintEvent(e);
|
||||||
if (_toggle) {
|
if (_toggle) {
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ public:
|
||||||
Fn<void()> &&callback,
|
Fn<void()> &&callback,
|
||||||
const style::icon *icon,
|
const style::icon *icon,
|
||||||
const style::icon *iconOver);
|
const style::icon *iconOver);
|
||||||
|
~Toggle();
|
||||||
|
|
||||||
void finishAnimating() override;
|
void finishAnimating() override;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue