Skip to content

Commit ae9cb31

Browse files
committed
format
1 parent dcc50ab commit ae9cb31

File tree

4 files changed

+52
-51
lines changed

4 files changed

+52
-51
lines changed

src/ruis/widget/group/touch/tabbed_book.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,40 +26,40 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2626
using namespace ruis::touch;
2727

2828
utki::shared_ref<ruis::tabbed_book> ruis::touch::make::tabbed_book(
29-
utki::shared_ref<ruis::context> context, //
30-
ruis::tabbed_book::all_parameters params,
31-
std::vector< //
32-
std::pair<
33-
utki::shared_ref<ruis::choice_button>, //
34-
utki::shared_ref<ruis::page> //
35-
> //
36-
> //
37-
pages
29+
utki::shared_ref<ruis::context> context, //
30+
ruis::tabbed_book::all_parameters params,
31+
std::vector< //
32+
std::pair<
33+
utki::shared_ref<ruis::choice_button>, //
34+
utki::shared_ref<ruis::page> //
35+
> //
36+
> //
37+
pages
3838
)
3939
{
40-
if (!params.tabbed_book_params.choice_group_factory) {
41-
// clang-format off
40+
if (!params.tabbed_book_params.choice_group_factory) {
41+
// clang-format off
4242
params.tabbed_book_params.choice_group_factory = [](
43-
utki::shared_ref<ruis::context> context,
44-
widget_list tabs
45-
){
46-
return ruis::touch::make::tab_group(std::move(context),
47-
{
48-
.layout_params{
49-
.dims{ruis::dim::fill, ruis::dim::min}
50-
}
51-
},
52-
std::move(tabs)
53-
);
54-
};
55-
// clang-format on
43+
utki::shared_ref<ruis::context> context,
44+
widget_list tabs
45+
){
46+
return ruis::touch::make::tab_group(std::move(context),
47+
{
48+
.layout_params{
49+
.dims{ruis::dim::fill, ruis::dim::min}
50+
}
51+
},
52+
std::move(tabs)
53+
);
54+
};
55+
// clang-format on
5656

57-
params.tabbed_book_params.reverse_order = true;
58-
}
57+
params.tabbed_book_params.reverse_order = true;
58+
}
5959

60-
return utki::make_shared<ruis::tabbed_book>(
61-
std::move(context), //
62-
std::move(params),
63-
std::move(pages)
64-
);
60+
return utki::make_shared<ruis::tabbed_book>(
61+
std::move(context), //
62+
std::move(params),
63+
std::move(pages)
64+
);
6565
}

src/ruis/widget/group/touch/tabbed_book.hpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ namespace ruis::touch {
2727

2828
namespace make {
2929
utki::shared_ref<ruis::tabbed_book> tabbed_book(
30-
utki::shared_ref<ruis::context> context, //
31-
ruis::tabbed_book::all_parameters params,
32-
std::vector< //
33-
std::pair<
34-
utki::shared_ref<ruis::choice_button>, //
35-
utki::shared_ref<ruis::page> //
36-
> //
37-
> //
38-
pages = {}
30+
utki::shared_ref<ruis::context> context, //
31+
ruis::tabbed_book::all_parameters params,
32+
std::vector< //
33+
std::pair<
34+
utki::shared_ref<ruis::choice_button>, //
35+
utki::shared_ref<ruis::page> //
36+
> //
37+
> //
38+
pages = {}
3939
);
40-
}
40+
} // namespace make
4141

42-
}
42+
} // namespace ruis::touch

tests/touch/src/gui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2222
#include "gui.hpp"
2323

2424
#include <ruis/res/image.hpp>
25-
#include <ruis/widget/group/touch/tabbed_book.hpp>
2625
#include <ruis/widget/group/overlay.hpp>
26+
#include <ruis/widget/group/touch/tabbed_book.hpp>
2727
#include <ruis/widget/label/image.hpp>
2828
#include <ruis/widget/label/padding.hpp>
2929

tests/touch/src/list_page.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2121

2222
#include "list_page.hpp"
2323

24-
namespace{
25-
class list_page : public ruis::page{
24+
namespace {
25+
class list_page : public ruis::page
26+
{
2627
public:
27-
list_page(utki::shared_ref<ruis::context> c) :
28-
ruis::widget(std::move(c), {}, {}),
29-
ruis::page(this->context, {})
30-
{}
28+
list_page(utki::shared_ref<ruis::context> c) :
29+
ruis::widget(std::move(c), {}, {}),
30+
ruis::page(this->context, {})
31+
{}
3132
};
3233

33-
}
34+
} // namespace
3435

3536
utki::shared_ref<ruis::page> make_list_page(utki::shared_ref<ruis::context> c)
3637
{
37-
return utki::make_shared<list_page>(std::move(c));
38+
return utki::make_shared<list_page>(std::move(c));
3839
}

0 commit comments

Comments
 (0)