zhangyiss/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2025-09-24 23:08:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Ref<XxxOption> and add new interfaces. (#686)

Browse Source 
1. Stop taking Ref<XxxOption> in Component constructors. Instead, use
   the XxxOption directly. Passing by copy avoid problems developers had
   where one was shared in between multiple component, causing issues.

2. Add variants of most component constructors taking a struct only.

This replaces:
https://github.com/ArthurSonzogni/FTXUI/pull/670

This fixes:
https://github.com/ArthurSonzogni/FTXUI/issues/426
This commit is contained in:
Arthur Sonzogni
2023-06-25 17:22:05 +02:00
committed by GitHub
parent e73e7f0d68
commit 455998d759
26 changed files with 918 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ftxui/component/slider.cpp
View File

@@ -35,24 +35,24 @@ Decorator flexDirection(Direction direction) {
template <class T>
class SliderBase : public ComponentBase {
public:
explicit SliderBase(Ref<SliderOption<T>> options)
: value_(options->value),
min_(options->min),
max_(options->max),
increment_(options->increment),
explicit SliderBase(SliderOption<T> options)
: value_(options.value),
min_(options.min),
max_(options.max),
increment_(options.increment),
options_(options) {}
Element Render() override {
auto gauge_color = Focused() ? color(options_->color_active)
: color(options_->color_inactive);
auto gauge_color = Focused() ? color(options_.color_active)
: color(options_.color_inactive);
const float percent = float(value_() - min_()) / float(max_() - min_());
return gaugeDirection(percent, options_->direction) |
flexDirection(options_->direction) | reflect(gauge_box_) |
return gaugeDirection(percent, options_.direction) |
flexDirection(options_.direction) | reflect(gauge_box_) |
gauge_color;
}
void OnLeft() {
switch (options_->direction) {
switch (options_.direction) {
case Direction::Right:
value_() -= increment_();
break;
@@ -66,7 +66,7 @@ class SliderBase : public ComponentBase {
}
void OnRight() {
switch (options_->direction) {
switch (options_.direction) {
case Direction::Right:
value_() += increment_();
break;
@@ -80,7 +80,7 @@ class SliderBase : public ComponentBase {
}
void OnUp() {
switch (options_->direction) {
switch (options_.direction) {
case Direction::Up:
value_() -= increment_();
break;
@@ -94,7 +94,7 @@ class SliderBase : public ComponentBase {
}
void OnDown() {
switch (options_->direction) {
switch (options_.direction) {
case Direction::Down:
value_() -= increment_();
break;
@@ -153,7 +153,7 @@ class SliderBase : public ComponentBase {
}
if (captured_mouse_) {
switch (options_->direction) {
switch (options_.direction) {
case Direction::Right: {
value_() = min_() + (event.mouse().x - gauge_box_.x_min) *
(max_() - min_()) /
@@ -192,15 +192,14 @@ class SliderBase : public ComponentBase {
ConstRef<T> min_;
ConstRef<T> max_;
ConstRef<T> increment_;
Ref<SliderOption<T>> options_;
SliderOption<T> options_;
Box gauge_box_;
CapturedMouse captured_mouse_;
};
class SliderWithLabel : public ComponentBase {
public:
SliderWithLabel(ConstStringRef label, Component inner)
: label_(std::move(label)) {
SliderWithLabel(ConstStringRef label, Component inner) : label_(label) {
Add(std::move(inner));
SetActiveChild(ChildAt(0));
}