Update fenster integration to use new layouting

Author: maxdev1

applications/fenster

@@ -28,6 +28,9 @@
 #include <libfenster/label.hpp>
 #include <libfenster/image.hpp>
 #include <libfenster/listener/key_listener.hpp>
+#include <libfenster/layout/flex_layout_manager.hpp>
+#include <libfenster/layout/grid_layout_manager.hpp>
+#include <libfenster/layout/flow_layout_manager.hpp>
 
 using namespace fenster;
 struct file_entry_t
@@ -68,19 +71,19 @@ int main()
 	window->setTitle("Navigator");
 	window->onClose([]() { g_exit(0); });
 
-	window->setLayout(FENSTER_LAYOUT_MANAGER_FLEX);
-	window->setFlexOrientation(false);
+	auto windowLayout = FlexLayoutManager::create(window);
+	windowLayout->setHorizontal(false);
 
 	Panel* navBar = Panel::create();
-	navBar->setLayout(FENSTER_LAYOUT_MANAGER_FLEX);
-	navBar->setLayoutPadding(Insets(5, 5, 5, 5));
-	navBar->setFlexGap(10);
+	auto navBarLayout = FlexLayoutManager::create(navBar);
+	navBarLayout->setPadding(Insets(5, 5, 5, 5));
+	navBarLayout->setSpace(10);
 	{
 		navPrev = Button::create();
 		navPrev->setStyle(FENSTER_BUTTON_STYLE_GHOST);
 		navPrev->setTitle("<");
 		navBar->addChild(navPrev);
-		navBar->setFlexComponentInfo(navPrev, 0, 1, 50);
+		navBarLayout->setComponentInfo(navPrev, 0, 1, 50);
 		navPrev->setActionListener([]()
 		{
 			if(historyCurrentPosition > 0)
@@ -95,7 +98,7 @@ int main()
 		navNext->setStyle(FENSTER_BUTTON_STYLE_GHOST);
 		navNext->setTitle(">");
 		navBar->addChild(navNext);
-		navBar->setFlexComponentInfo(navNext, 0, 1, 50);
+		navBarLayout->setComponentInfo(navNext, 0, 1, 50);
 		navNext->setActionListener([]()
 		{
 			if(historyCurrentPosition >= 0 && historyCurrentPosition < (int) history.size() - 1)
@@ -108,7 +111,7 @@ int main()
 
 		navText = TextField::create();
 		navBar->addChild(navText);
-		navBar->setFlexComponentInfo(navText, 1, 1, 0);
+		navBarLayout->setComponentInfo(navText, 1, 1, 0);
 		navText->addKeyListener([](KeyEvent& e)
 		{
 			// TODO: g_keyboard needs a layout right now, maybe key events should already send ASCII codes:
@@ -124,7 +127,7 @@ int main()
 		navUp->setTitle("^");
 		navUp->setStyle(FENSTER_BUTTON_STYLE_GHOST);
 		navBar->addChild(navUp);
-		navBar->setFlexComponentInfo(navUp, 0, 1, 50);
+		navBarLayout->setComponentInfo(navUp, 0, 1, 50);
 
 		navUp->setActionListener([]()
 		{
@@ -135,24 +138,25 @@ int main()
 		});
 	}
 	window->addChild(navBar);
-	window->setFlexComponentInfo(navBar, 0, 1, 40);
+	windowLayout->setComponentInfo(navBar, 0, 1, 40);
 
 	Panel* centerPanel = Panel::create();
 	centerPanel->setBackground(_RGB(255, 255, 255));
-	centerPanel->setLayout(FENSTER_LAYOUT_MANAGER_GRID);
+	GridLayoutManager::create(centerPanel);
 	{
 		scroller = ScrollPane::create();
 		content = Panel::create();
-		content->setLayout(FENSTER_LAYOUT_MANAGER_FLOW);
-		content->setLayoutPadding(Insets(5, 5, 5, 5));
+
+		auto contentLayout = FlowLayoutManager::create(content);
+		contentLayout->setPadding(Insets(5, 5, 5, 5));
 
 		scroller->setFixed(true, false);
 		scroller->setContent(content);
 
 		centerPanel->addChild(scroller);
 	}
 	window->addChild(centerPanel);
-	window->setFlexComponentInfo(centerPanel, 1, 1, 0);
+	windowLayout->setComponentInfo(centerPanel, 1, 1, 0);
 
 	window->setVisible(true);
 	window->onClose([]()

applications/navigator/src/navigator.cpp

@@ -25,6 +25,7 @@
 #include <cstdio>
 #include <cstring>
 #include <libfenster/color_argb.hpp>
+#include <libfenster/layout/grid_layout_manager.hpp>
 
 void guiScreenBlinkCursorEntry(gui_screen_t* screen);
 void guiScreenPaintEntry(gui_screen_t* screen);
@@ -107,7 +108,7 @@ bool gui_screen_t::createUi()
 		return this;
 	});
 
-	window->setLayout(FENSTER_LAYOUT_MANAGER_GRID);
+	window->setLayoutManager(GridLayoutManager::create(window));
 	window->addChild(canvas.component);
 
 	Rectangle windowBounds = Rectangle(80, 80, 700, 500);

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

@@ -7,7 +7,7 @@ fi
 
 # Build configuration
 ARTIFACT_NAME="tester.bin"
-LDFLAGS="-lps2driver"
+LDFLAGS="-lps2driver -lfenster"
 
 # Include application build tasks
 . "../applications.sh"

applications/testprogram/build.sh

@@ -20,13 +20,66 @@
 
 #include "tester.hpp"
 
-#include <assert.h>
-#include <ghost.h>
-#include <libgen.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <string.h>
+#include <libfenster/application.hpp>
+#include <libfenster/window.hpp>
+#include <libfenster/panel.hpp>
+#include <cstdio>
+#include <libfenster/checkbox.hpp>
+#include <libfenster/label.hpp>
+#include <libfenster/layout/stack_layout_manager.hpp>
 
 int main(int argc, char** argv)
 {
+	if(fenster::Application::open() != FENSTER_APPLICATION_STATUS_SUCCESSFUL)
+	{
+		printf("Failed to start UI\n");
+		return -1;
+	}
+
+	auto window = fenster::Window::create();
+	window->onClose([]()
+	{
+		g_exit(0);
+	});
+	fenster::StackLayoutManager::create(window);
+
+	auto panel = fenster::Panel::create();
+	panel->setBackground(_RGB(200, 200, 255));
+
+	auto stackLayout = fenster::StackLayoutManager::create(panel);
+	stackLayout->setPadding(fenster::Insets(10, 10, 10, 10));
+	stackLayout->setSpace(20);
+
+	auto testLabel = fenster::Label::create();
+	testLabel->setTitle("Choose the checkbox to test listener behaviour:");
+	panel->addChild(testLabel);
+
+	auto check = fenster::Checkbox::create();
+	check->setTitle("Enable other field");
+	panel->addChild(check);
+
+	auto conditionalLabel = fenster::Label::create();
+	conditionalLabel->setTitle("Conditional label");
+	conditionalLabel->setVisible(false);
+	panel->addChild(conditionalLabel);
+	check->addCheckedListener([conditionalLabel](bool checked)
+	{
+		printf("Check state changed to %s\n", checked ? "checked" : "unchecked");
+		conditionalLabel->setVisible(checked);
+	});
+
+	auto testLabel2 = fenster::Label::create();
+	testLabel2->setTitle("Very cool.");
+	panel->addChild(testLabel2);
+
+	window->addChild(panel);
+
+	window->setTitle("Test window");
+	window->setBounds(fenster::Rectangle(70, 70, 400, 300));
+	window->setVisible(true);
+
+	for(;;)
+	{
+		g_sleep(999999);
+	}
 }