lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove toggle_button, make checkbox support children by default

Browse source
This commit is contained in:
Nikita Lisitsa 2022-05-17 22:03:40 +03:00
parent 9c744b9a21
commit 3f9275b2ad
7 changed files with 32 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/ui/include/psemek/ui/checkbox.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include <psemek/ui/element.hpp>
#include <psemek/ui/single_container.hpp>
#include <functional>
@ -8,8 +8,12 @@ namespace psemek::ui
{
struct checkbox
: element
: single_container
{
struct label * label() const;
struct image_view * icon() const;
bool on_event(mouse_move const & e) override;
bool on_event(mouse_click const & e) override;

7
libs/ui/include/psemek/ui/element_factory.hpp
View file

@ -17,7 +17,6 @@ namespace psemek::ui
struct image_view;
struct rich_image_view;
struct checkbox;
struct toggle_button;
struct slider;
struct spinbox;
struct scroller;
@ -39,9 +38,9 @@ namespace psemek::ui
virtual std::shared_ptr<image_view> make_image_view(gfx::texture_view_2d image);
virtual std::shared_ptr<rich_image_view> make_rich_image_view(std::shared_ptr<gfx::texture_2d> image);
virtual std::shared_ptr<checkbox> make_checkbox(bool value);
virtual std::shared_ptr<toggle_button> make_toggle_button();
virtual std::shared_ptr<toggle_button> make_toggle_button(std::string text);
virtual std::shared_ptr<toggle_button> make_toggle_button(gfx::texture_view_2d icon);
virtual std::shared_ptr<checkbox> make_toggle_button();
virtual std::shared_ptr<checkbox> make_toggle_button(std::string text);
virtual std::shared_ptr<checkbox> make_toggle_button(gfx::texture_view_2d icon);
virtual std::shared_ptr<slider> make_slider();
virtual std::shared_ptr<spinbox> make_spinbox();
// directions:

33
libs/ui/include/psemek/ui/toggle_button.hpp
View file

@ -1,33 +0,0 @@
#pragma once
#include <psemek/ui/checkbox.hpp>
#include <psemek/ui/label.hpp>
#include <psemek/ui/image_view.hpp>
namespace psemek::ui
{
struct toggle_button
: checkbox
{
struct label * label() { return label_.get(); }
struct label const * label() const { return label_.get(); }
struct image_view * icon() { return icon_.get(); }
struct image_view const * icon() const { return icon_.get(); }
virtual void set_label(std::shared_ptr<struct label> label);
virtual void set_icon(std::shared_ptr<image_view> icon);
children_range children() const override;
~toggle_button() override;
private:
std::shared_ptr<struct label> label_;
std::shared_ptr<image_view> icon_;
element * children_[1]{nullptr};
};
}

12
libs/ui/source/checkbox.cpp
View file

@ -1,8 +1,20 @@
#include <psemek/ui/checkbox.hpp>
#include <psemek/ui/label.hpp>
#include <psemek/ui/image_view.hpp>
namespace psemek::ui
{
label * checkbox::label() const
{
return dynamic_cast<struct label *>(child().get());
}
image_view * checkbox::icon() const
{
return dynamic_cast<struct image_view *>(child().get());
}
bool checkbox::on_event(mouse_move const & e)
{
bool const over = shape().contains(geom::cast<float>(e.position));

5
libs/ui/source/default_element_factory.cpp
View file

@ -419,6 +419,11 @@ namespace psemek::ui
struct checkbox_impl
: checkbox
{
std::shared_ptr<element> set_child(std::shared_ptr<element>) override
{
throw std::runtime_error("default checkbox doesn't support children");
}
struct shape const & shape() const override
{
return shape_;

12
libs/ui/source/element_factory.cpp
View file

@ -2,7 +2,7 @@
#include <psemek/ui/label.hpp>
#include <psemek/ui/button.hpp>
#include <psemek/ui/toggle_button.hpp>
#include <psemek/ui/checkbox.hpp>
#include <psemek/ui/image_view.hpp>
#include <psemek/ui/rich_image_view.hpp>
#include <psemek/ui/grid_layout.hpp>
@ -85,9 +85,9 @@ namespace psemek::ui
return nullptr;
}
std::shared_ptr<toggle_button> element_factory::make_toggle_button() { return nullptr; }
std::shared_ptr<checkbox> element_factory::make_toggle_button() { return nullptr; }
std::shared_ptr<toggle_button> element_factory::make_toggle_button(std::string text)
std::shared_ptr<checkbox> element_factory::make_toggle_button(std::string text)
{
auto b = make_toggle_button();
if (b)
@ -98,13 +98,13 @@ namespace psemek::ui
l->set_valign(label::valignment::center);
l->set_halign(label::halignment::center);
l->set_overflow(label::overflow_mode::ellipsis);
b->set_label(l);
b->set_child(l);
}
}
return b;
}
std::shared_ptr<toggle_button> element_factory::make_toggle_button(gfx::texture_view_2d icon)
std::shared_ptr<checkbox> element_factory::make_toggle_button(gfx::texture_view_2d icon)
{
auto b = make_toggle_button();
if (b)
@ -114,7 +114,7 @@ namespace psemek::ui
{
i->set_downscale(false);
i->set_upscale(false);
b->set_icon(i);
b->set_child(i);
}
}
return b;

44
libs/ui/source/toggle_button.cpp
View file

@ -1,44 +0,0 @@
#include <psemek/ui/toggle_button.hpp>
namespace psemek::ui
{
element::children_range toggle_button::children() const
{
return children_range{children_};
}
toggle_button::~toggle_button()
{
release_children();
}
void toggle_button::set_label(std::shared_ptr<struct label> label)
{
if (icon())
set_icon(nullptr);
if (label_) label_->set_parent(nullptr);
label_ = std::move(label);
children_[0] = label_.get();
if (label_) label_->set_parent(this);
}
void toggle_button::set_icon(std::shared_ptr<image_view> icon)
{
if (label())
set_label(nullptr);
if (icon_) icon_->set_parent(nullptr);
icon_ = std::move(icon);
children_[0] = icon_.get();
if (icon_)
{
icon_->set_parent(this);
icon_->set_downscale(false);
}
}
}