jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Basic Font integration.

Browse source
This commit is contained in:
James Grogan 2022-11-15 09:32:28 +00:00
parent ce11c52ae5
commit 72123bc333
36 changed files with 325 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ui_elements/desktop_elements/Window.cpp
View file

@ -9,7 +9,9 @@
#include "Scene.h"
#include "TriMesh.h"
#include "AbstractPainter.h"
#include "DrawingContext.h"
#include "FontsManager.h"
#include "IPlatformWindow.h"
#include "Screen.h"
@ -89,10 +91,10 @@ IPlatformWindow* Window::getPlatformWindow() const
return nullptr;
}
void Window::setPlatformWindow(IPlatformWindowPtr window, DrawingMode drawingMode)
void Window::setPlatformWindow(IPlatformWindowPtr window, FontsManager* fontsManager, DrawingMode drawingMode)
{
mPlatformWindow = std::move(window);
mDrawingContext = std::make_unique<DrawingContext>(this, drawingMode);
mDrawingContext = std::make_unique<DrawingContext>(this, fontsManager, drawingMode);
}
void Window::map()

4
src/ui_elements/desktop_elements/Window.h
View file

@ -11,7 +11,9 @@ class MouseEvent;
class KeyboardEvent;
class DrawingContext;
class FontsManager;
enum class DrawingMode;
class Widget;
using WidgetPtr = std::unique_ptr<Widget>;
class IPlatformWindow;
@ -43,7 +45,7 @@ public:
IPlatformWindow* getPlatformWindow() const;
void setPlatformWindow(IPlatformWindowPtr window, DrawingMode drawingMode);
void setPlatformWindow(IPlatformWindowPtr window, FontsManager* fontsManager, DrawingMode drawingMode);
void map();