Skip to content

Commit b807f15

Browse files
author
maxdev1
committed
Layout changes
1 parent f249134 commit b807f15

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

applications/fenster

Submodule fenster updated 35 files

applications/navigator/src/navigator.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include <libfenster/label.hpp>
2929
#include <libfenster/image.hpp>
3030
#include <libfenster/listener/key_listener.hpp>
31-
#include <libfenster/layout/flex_layout_manager.hpp>
32-
#include <libfenster/layout/grid_layout_manager.hpp>
33-
#include <libfenster/layout/flow_layout_manager.hpp>
31+
#include <libfenster/layout/flex_layout.hpp>
32+
#include <libfenster/layout/grid_layout.hpp>
33+
#include <libfenster/layout/flow_layout.hpp>
3434

3535
using namespace fenster;
3636
struct file_entry_t
@@ -71,11 +71,11 @@ int main()
7171
window->setTitle("Navigator");
7272
window->onClose([]() { g_exit(0); });
7373

74-
auto windowLayout = FlexLayoutManager::create(window);
74+
auto windowLayout = FlexLayout::create(window);
7575
windowLayout->setHorizontal(false);
7676

7777
Panel* navBar = Panel::create();
78-
auto navBarLayout = FlexLayoutManager::create(navBar);
78+
auto navBarLayout = FlexLayout::create(navBar);
7979
navBarLayout->setPadding(Insets(5, 5, 5, 5));
8080
navBarLayout->setSpace(10);
8181
{
@@ -142,12 +142,12 @@ int main()
142142

143143
Panel* centerPanel = Panel::create();
144144
centerPanel->setBackground(_RGB(255, 255, 255));
145-
GridLayoutManager::create(centerPanel);
145+
GridLayout::create(centerPanel);
146146
{
147147
scroller = ScrollPane::create();
148148
content = Panel::create();
149149

150-
auto contentLayout = FlowLayoutManager::create(content);
150+
auto contentLayout = FlowLayout::create(content);
151151
contentLayout->setPadding(Insets(5, 5, 5, 5));
152152

153153
scroller->setFixed(true, false);

applications/terminal/src/screen/gui/gui_screen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <cstdio>
2626
#include <cstring>
2727
#include <libfenster/color_argb.hpp>
28-
#include <libfenster/layout/grid_layout_manager.hpp>
28+
#include <libfenster/layout/grid_layout.hpp>
2929

3030
void guiScreenBlinkCursorEntry(gui_screen_t* screen);
3131
void guiScreenPaintEntry(gui_screen_t* screen);
@@ -108,7 +108,7 @@ bool gui_screen_t::createUi()
108108
return this;
109109
});
110110

111-
window->setLayoutManager(GridLayoutManager::create(window));
111+
GridLayout::create(window);
112112
window->addChild(canvas.component);
113113

114114
Rectangle windowBounds = Rectangle(80, 80, 700, 500);

applications/testprogram/src/tester.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <cstdio>
2727
#include <libfenster/checkbox.hpp>
2828
#include <libfenster/label.hpp>
29-
#include <libfenster/layout/stack_layout_manager.hpp>
29+
#include <libfenster/layout/stack_layout.hpp>
3030

3131
int main(int argc, char** argv)
3232
{
@@ -41,12 +41,12 @@ int main(int argc, char** argv)
4141
{
4242
g_exit(0);
4343
});
44-
fenster::StackLayoutManager::create(window);
44+
fenster::StackLayout::create(window);
4545

4646
auto panel = fenster::Panel::create();
4747
panel->setBackground(_RGB(200, 200, 255));
4848

49-
auto stackLayout = fenster::StackLayoutManager::create(panel);
49+
auto stackLayout = fenster::StackLayout::create(panel);
5050
stackLayout->setPadding(fenster::Insets(10, 10, 10, 10));
5151
stackLayout->setSpace(20);
5252

0 commit comments

Comments
 (0)