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

Make ui::grid_layout::get return shared_ptr

Browse source
This commit is contained in:
Nikita Lisitsa 2022-02-07 21:13:41 +03:00
parent 754566ec15
commit fa581d0ed3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/ui/include/psemek/ui/grid_layout.hpp
View file

@ -28,7 +28,7 @@ namespace psemek::ui
virtual void set_row_weight(std::size_t i, float w); virtual void set_row_weight(std::size_t i, float w);
virtual void set_column_weight(std::size_t i, float w); virtual void set_column_weight(std::size_t i, float w);
virtual element * get(std::size_t i, std::size_t j) const; virtual std::shared_ptr<element> get(std::size_t i, std::size_t j) const;
virtual std::shared_ptr<element> set(std::size_t i, std::size_t j, std::shared_ptr<element> c); virtual std::shared_ptr<element> set(std::size_t i, std::size_t j, std::shared_ptr<element> c);
virtual std::shared_ptr<element> remove(std::size_t i, std::size_t j); virtual std::shared_ptr<element> remove(std::size_t i, std::size_t j);

8
libs/ui/source/grid_layout.cpp
View file

@ -32,7 +32,7 @@ namespace psemek::ui
{ {
for (std::size_t i = 0; i < row_count(); ++i) for (std::size_t i = 0; i < row_count(); ++i)
for (std::size_t j = 0; j < column_count(); ++j) for (std::size_t j = 0; j < column_count(); ++j)
if (get(i, j) == c) return true; if (get(i, j).get() == c) return true;
return false; return false;
} }
@ -42,7 +42,7 @@ namespace psemek::ui
{ {
for (std::size_t j = 0; j < column_count(); ++j) for (std::size_t j = 0; j < column_count(); ++j)
{ {
if (get(i, j) == c) if (get(i, j).get() == c)
{ {
return remove(i, j); return remove(i, j);
} }
@ -100,9 +100,9 @@ namespace psemek::ui
post_reshape(); post_reshape();
} }
element * grid_layout::get(std::size_t i, std::size_t j) const std::shared_ptr<element> grid_layout::get(std::size_t i, std::size_t j) const
{ {
return children_(i, j).get(); return children_(i, j);
} }
std::shared_ptr<element> grid_layout::set(std::size_t i, std::size_t j, std::shared_ptr<element> c) std::shared_ptr<element> grid_layout::set(std::size_t i, std::size_t j, std::shared_ptr<element> c)