Update fenster & fix integration

Author: maxdev1

applications/calculator/src/calculator.cpp

@@ -21,7 +21,7 @@
 #include <calculator.hpp>
 #include <libfenster/components/button.hpp>
 #include <libfenster/components/label.hpp>
-#include <libfenster/components/text_field.hpp>
+#include <libfenster/components/text_box.hpp>
 #include <libfenster/application.hpp>
 #include <libfenster/components/window.hpp>
 #include <libfenster/metrics/rectangle.hpp>
@@ -32,7 +32,7 @@
 using namespace fenster;
 
 Window* window;
-TextField* display;
+TextBox* display;
 Button* but1;
 Button* but2;
 Button* but3;
@@ -68,7 +68,7 @@ int main()
 			g_exit(0);
 		});
 
-		display = TextField::create();
+		display = TextBox::create();
 		display->setTitle("0");
 		display->setBounds(Rectangle(10, 10, 150, 30));
 		window->addChild(display);

applications/desktop/src/taskbar.cpp

@@ -22,7 +22,6 @@
 
 #include <cairo/cairo.h>
 #include <cstdlib>
-#include <map>
 #include <libfenster/font/text_layouter.hpp>
 #include <libfenster/font/font_loader.hpp>
 #include <helper.hpp>
@@ -34,7 +33,7 @@ Font* font = nullptr;
 taskbar_t::taskbar_t(ComponentId id):
 	Component(id), Canvas(id), FocusableComponent(id)
 {
-	textLayoutBuffer = TextLayouter::getInstance()->initializeBuffer();
+	textLayoutBuffer = TextLayouter::initializeLayout();
 }
 
 taskbar_t* taskbar_t::create()
@@ -213,19 +212,13 @@ void taskbar_t::paint()
 			entry->onView = Rectangle(entryLeft + 2, 4, taskWidth - 4, bounds.height - 8);
 
 			Rectangle textArea(10, 0, taskWidth - 20, bounds.height - 10);
-			TextLayouter::getInstance()->layout(cr, entry->title.c_str(), font, 14, textArea, TextAlignment::LEFT,
-			                                       textLayoutBuffer);
+			TextLayouter::layout(cr, entry->title.c_str(), font, 14, textArea, TextAlignment::LEFT, textLayoutBuffer);
 			for(PositionedGlyph& g: textLayoutBuffer->positions)
 			{
 
-				Rectangle onView(g.position.x, g.position.y, g.size.width, g.size.height);
-
 				cairo_save(cr);
 				cairo_set_source_rgb(cr, 0.96, 0.98, 0.98);
-				// TODO text layouter is buggy (need to subtract glyph positions):
-				cairo_translate(cr, entryLeft + onView.x - g.glyph->x, onView.y - g.glyph->y + 10);
-				cairo_glyph_path(cr, g.glyph, g.glyph_count);
-				cairo_fill(cr);
+				TextLayouter::paintChar(cr, g);
 				cairo_restore(cr);
 			}
 		}

applications/editor/src/editor.cpp

@@ -22,7 +22,7 @@
 #include <libfenster/application.hpp>
 #include <libfenster/components/window.hpp>
 #include <libfenster/layout/grid_layout.hpp>
-#include <libfenster/components/text_area.hpp>
+#include <libfenster/components/text_box.hpp>
 #include <fstream>
 #include <string>
 #include <iterator>
@@ -44,7 +44,8 @@ int main(int argc, char* argv[])
 
 	auto windowLayout = GridLayout::create(window);
 
-	auto textArea = TextArea::create();
+	auto textArea = TextBox::create();
+	textArea->setMultiLine(true);
 	window->addChild(textArea);
 
 	if(argc > 1)
@@ -53,7 +54,7 @@ int main(int argc, char* argv[])
 		if(file)
 		{
 			textArea->setTitle(std::string(std::istreambuf_iterator<char>(file),
-			                               std::istreambuf_iterator<char>()).c_str());
+										   std::istreambuf_iterator<char>()).c_str());
 		}
 	}
 

applications/fenster

@@ -22,7 +22,7 @@
 #include <libfenster/application.hpp>
 #include <libfenster/components/window.hpp>
 #include <libfenster/interface.hpp>
-#include <libfenster/components/text_field.hpp>
+#include <libfenster/components/text_box.hpp>
 #include <libfenster/components/panel.hpp>
 #include <libfenster/components/scrollpane.hpp>
 #include <libfenster/components/label.hpp>
@@ -44,7 +44,7 @@ std::string currentBase = "/";
 
 ScrollPane* scroller;
 Panel* content;
-TextField* navText;
+TextBox* navText;
 Button* navPrev;
 Button* navNext;
 Button* navUp;
@@ -61,7 +61,7 @@ void navigatorLoad(bool keepHistory = false);
 
 int main()
 {
-	if(Application::open() != fenster::ApplicationOpenStatus::Success)
+	if(Application::open() != ApplicationOpenStatus::Success)
 	{
 		klog("failed to create UI");
 		return -1;
@@ -111,7 +111,7 @@ int main()
 			}
 		});
 
-		navText = TextField::create();
+		navText = TextBox::create();
 		navBar->addChild(navText);
 		navBarLayout->setComponentInfo(navText, 1, 1, 0);
 		navText->addKeyListener([](KeyEvent& e)

applications/navigator/src/navigator.cpp

@@ -51,6 +51,6 @@
 // version
 #define G_VERSION_MAJOR 1
 #define G_VERSION_MINOR 2
-#define G_VERSION_PATCH 0
+#define G_VERSION_PATCH 1
 
 #endif