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

Fix up build.

Browse source
This commit is contained in:
jmsgrogan 2023-01-20 08:07:09 +00:00
parent f26ee2ebc4
commit b5f21900eb
16 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/notes_tk/audio_editor/AudioEditorView.cpp
View file

@ -8,7 +8,6 @@ AudioEditorView::AudioEditorView()
{ {
auto label = Label::Create(); auto label = Label::Create();
label->setLabel("audio Editor"); label->setLabel("audio Editor");
label->setBackground(ThemeToken::SystemToken::Primary);
label->setMargin(1); label->setMargin(1);
addWidget(std::move(label)); addWidget(std::move(label));
} }

2
apps/notes_tk/canvas/CanvasCommandSelectorView.cpp
View file

@ -15,7 +15,6 @@ CanvasCommandSelectorView::CanvasCommandSelectorView()
onCommandSelected(CanvasDrawCommand::CIRCLE); onCommandSelected(CanvasDrawCommand::CIRCLE);
}; };
circle_button->setLabel("Circle"); circle_button->setLabel("Circle");
circle_button->setBackground(ThemeToken::SystemToken::Primary);
circle_button->setMargin(2); circle_button->setMargin(2);
circle_button->setOnClickFunction(on_circle_click); circle_button->setOnClickFunction(on_circle_click);
@ -24,7 +23,6 @@ CanvasCommandSelectorView::CanvasCommandSelectorView()
}; };
auto line_button = Button::Create(); auto line_button = Button::Create();
line_button->setLabel("Line"); line_button->setLabel("Line");
line_button->setBackground(ThemeToken::SystemToken::Primary);
line_button->setMargin(2); line_button->setMargin(2);
line_button->setOnClickFunction(on_line_click); line_button->setOnClickFunction(on_line_click);

2
apps/notes_tk/canvas/CanvasDrawingArea.cpp
View file

@ -15,7 +15,7 @@ void CanvasDrawingArea::addShapeAt(unsigned x, unsigned y)
{ {
if (mActiveDrawingCommand == CanvasDrawCommand::CIRCLE) if (mActiveDrawingCommand == CanvasDrawCommand::CIRCLE)
{ {
auto circle = std::make_unique<CircleNode>(DiscretePoint(x, y), 5); auto circle = std::make_unique<CircleNode>(Transform(DiscretePoint(x, y)), 5);
circle->setFillColor(Color(255, 0, 0)); circle->setFillColor(Color(255, 0, 0));
circle->setName("CanvasDrawingArea_CircleNode"); circle->setName("CanvasDrawingArea_CircleNode");

6
apps/notes_tk/canvas/CanvasView.cpp
View file

@ -36,11 +36,9 @@ void CanvasView::initialize()
{ {
auto label = Label::Create(); auto label = Label::Create();
label->setLabel("Canvas"); label->setLabel("Canvas");
label->setBackground(ThemeToken::SystemToken::Secondary);
label->setMargin(1); label->setMargin(1);
auto controls = std::make_unique<CanvasCommandSelectorView>(); auto controls = std::make_unique<CanvasCommandSelectorView>();
controls->setBackground(ThemeToken::SystemToken::Background);
controls->setMargin(1); controls->setMargin(1);
auto on_draw_command_changed = [this](CanvasDrawCommand command){ auto on_draw_command_changed = [this](CanvasDrawCommand command){
@ -49,7 +47,6 @@ void CanvasView::initialize()
controls->setCommandSelectedCallback(on_draw_command_changed); controls->setCommandSelectedCallback(on_draw_command_changed);
auto drawing_area = std::make_unique<CanvasDrawingArea>(); auto drawing_area = std::make_unique<CanvasDrawingArea>();
drawing_area->setBackground(ThemeToken::SystemToken::Background);
drawing_area->setMargin(1); drawing_area->setMargin(1);
mDrawingArea = drawing_area.get(); mDrawingArea = drawing_area.get();
@ -77,17 +74,14 @@ std::unique_ptr<Widget> CanvasView::initializeCacheButtons()
{ {
auto saveButton = Button::Create(); auto saveButton = Button::Create();
saveButton->setLabel("Save"); saveButton->setLabel("Save");
saveButton->setBackground(ThemeToken::SystemToken::Primary);
saveButton->setMargin(2); saveButton->setMargin(2);
auto clearButton = Button::Create(); auto clearButton = Button::Create();
clearButton->setLabel("Clear"); clearButton->setLabel("Clear");
clearButton->setBackground(ThemeToken::SystemToken::Primary);
clearButton->setMargin(2); clearButton->setMargin(2);
auto loadButton = Button::Create(); auto loadButton = Button::Create();
loadButton->setLabel("Load"); loadButton->setLabel("Load");
loadButton->setBackground(ThemeToken::SystemToken::Primary);
loadButton->setMargin(2); loadButton->setMargin(2);
auto buttonSpacer = VerticalSpacer::Create(); auto buttonSpacer = VerticalSpacer::Create();

1
apps/notes_tk/image_editor/ImageEditorView.cpp
View file

@ -12,7 +12,6 @@ ImageEditorView::ImageEditorView()
{ {
auto label = Label::Create(); auto label = Label::Create();
label->setLabel("Image Editor"); label->setLabel("Image Editor");
label->setBackground(ThemeToken::SystemToken::Primary);
label->setMargin(1); label->setMargin(1);
auto image_widget = std::make_unique<ImageViewWidget>(); auto image_widget = std::make_unique<ImageViewWidget>();

3
apps/notes_tk/image_editor/ImageViewWidget.cpp
View file

@ -20,7 +20,7 @@ void ImageViewWidget::doPaint(const PaintEvent* event)
if (!mGridNode) if (!mGridNode)
{ {
mGridNode = std::make_unique<GridNode>(mLocation); mGridNode = std::make_unique<GridNode>(Transform(mLocation));
mGridNode->setName(mName + "_GridNode"); mGridNode->setName(mName + "_GridNode");
mGridNode->setNumX(mNumX); mGridNode->setNumX(mNumX);
mGridNode->setNumY(mNumY); mGridNode->setNumY(mNumY);
@ -35,7 +35,6 @@ void ImageViewWidget::doPaint(const PaintEvent* event)
if (mTransformDirty) if (mTransformDirty)
{ {
mGridNode->setLocation(mLocation);
mGridNode->setWidth(mSize.mWidth); mGridNode->setWidth(mSize.mWidth);
mGridNode->setHeight(mSize.mHeight); mGridNode->setHeight(mSize.mHeight);
} }

4
apps/notes_tk/mesh_viewer/MeshViewerView.cpp
View file

@ -23,7 +23,6 @@ MeshViewerView::~MeshViewerView()
MeshViewerView::MeshViewerView() MeshViewerView::MeshViewerView()
{ {
mName = "MeshViewerView"; mName = "MeshViewerView";
mBackground = ThemeToken::SystemToken::Background;
} }
void MeshViewerView::doPaint(const PaintEvent* event) void MeshViewerView::doPaint(const PaintEvent* event)
@ -35,7 +34,7 @@ void MeshViewerView::doPaint(const PaintEvent* event)
if (!mMeshNode) if (!mMeshNode)
{ {
mMeshNode = std::make_unique<MeshNode>(mLocation); mMeshNode = std::make_unique<MeshNode>(Transform(mLocation));
mMeshNode->setName(mName + "_MeshNode"); mMeshNode->setName(mName + "_MeshNode");
mMeshNode->setWidth(mSize.mWidth); mMeshNode->setWidth(mSize.mWidth);
@ -48,7 +47,6 @@ void MeshViewerView::doPaint(const PaintEvent* event)
if (mTransformDirty) if (mTransformDirty)
{ {
mMeshNode->setLocation(mLocation);
mMeshNode->setWidth(mSize.mWidth); mMeshNode->setWidth(mSize.mWidth);
mMeshNode->setHeight(mSize.mHeight); mMeshNode->setHeight(mSize.mHeight);
} }

5
apps/notes_tk/text_editor/TextEditorView.cpp
View file

@ -25,7 +25,6 @@ void TextEditorView::initialize()
{ {
auto label = Label::Create(); auto label = Label::Create();
label->setLabel("Text Editor"); label->setLabel("Text Editor");
label->setBackground(ThemeToken::SystemToken::Secondary);
label->setMargin(1); label->setMargin(1);
auto textBox = TextBox::Create(); auto textBox = TextBox::Create();
@ -34,7 +33,7 @@ void TextEditorView::initialize()
auto saveButton = Button::Create(); auto saveButton = Button::Create();
saveButton->setLabel("Save"); saveButton->setLabel("Save");
saveButton->setBackground(ThemeToken::SystemToken::Primary); saveButton->setBackground(Theme::Sys::Color::Primary);
saveButton->setMargin(2); saveButton->setMargin(2);
auto onSave = [this](Widget* self){ auto onSave = [this](Widget* self){
if(this && mController && mTextBox) if(this && mController && mTextBox)
@ -47,7 +46,6 @@ void TextEditorView::initialize()
auto clearButton = Button::Create(); auto clearButton = Button::Create();
clearButton->setLabel("Clear"); clearButton->setLabel("Clear");
clearButton->setBackground(ThemeToken::SystemToken::Primary);
clearButton->setMargin(2); clearButton->setMargin(2);
auto onClear = [this](Widget* self){ auto onClear = [this](Widget* self){
if(this && mController && mTextBox) if(this && mController && mTextBox)
@ -60,7 +58,6 @@ void TextEditorView::initialize()
auto loadButton = Button::Create(); auto loadButton = Button::Create();
loadButton->setLabel("Load"); loadButton->setLabel("Load");
loadButton->setBackground(ThemeToken::SystemToken::Primary);
loadButton->setMargin(2); loadButton->setMargin(2);
auto onLoad = [this](Widget* self){ auto onLoad = [this](Widget* self){
if(this && mController && mTextBox) if(this && mController && mTextBox)

1
apps/notes_tk/web_client/WebClientView.cpp
View file

@ -10,7 +10,6 @@ WebClientView::WebClientView()
{ {
auto label = Label::Create(); auto label = Label::Create();
label->setLabel("Web Client"); label->setLabel("Web Client");
label->setBackground(ThemeToken::SystemToken::Secondary);
label->setMargin(1); label->setMargin(1);
addWidget(std::move(label)); addWidget(std::move(label));
} }

3
src/base/network/CMakeLists.txt
View file

@ -18,6 +18,8 @@ list(APPEND platform_INCLUDES
server/win32/Win32WebResponse.cpp server/win32/Win32WebResponse.cpp
server/win32/Win32Buffer.h server/win32/Win32Buffer.h
server/win32/Win32Buffer.cpp server/win32/Win32Buffer.cpp
client/win32/WinInetClient.h
client/win32/WinInetClient.cpp
) )
list(APPEND platform_LIBS Httpapi.lib) list(APPEND platform_LIBS Httpapi.lib)
endif() endif()
@ -43,6 +45,7 @@ target_include_directories(${MODULE_NAME} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/sockets ${CMAKE_CURRENT_SOURCE_DIR}/sockets
${CMAKE_CURRENT_SOURCE_DIR}/web ${CMAKE_CURRENT_SOURCE_DIR}/web
${CMAKE_CURRENT_SOURCE_DIR}/server/win32 ${CMAKE_CURRENT_SOURCE_DIR}/server/win32
${CMAKE_CURRENT_SOURCE_DIR}/client/win32
) )
set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
target_link_libraries( ${MODULE_NAME} PUBLIC core ${platform_LIBS}) target_link_libraries( ${MODULE_NAME} PUBLIC core ${platform_LIBS})

0
src/base/network/client/win32/WinInetClient.cpp Normal file
View file

0
src/base/network/client/win32/WinInetClient.h Normal file
View file

6
src/rendering/visual_elements/nodes/TextNode.cpp
View file

@ -167,9 +167,9 @@ void TextNode::update(SceneInfo* sceneInfo)
if (mTransformIsDirty) if (mTransformIsDirty)
{ {
//mTextItem->updateTransform({mLocation}); //mTextItem->updateTransform({mLocation});
//mTextItem->setTextWidth(mWidth); mTextItem->setTextWidth(mWidth);
//mTextItem->setTextHeight(mHeight); mTextItem->setTextHeight(mHeight);
//mTransformIsDirty = false; mTransformIsDirty = false;
} }
if (mMaterialIsDirty) if (mMaterialIsDirty)

4
src/ui/ui_controls/Button.cpp
View file

@ -220,7 +220,7 @@ void Button::updateLabel(const PaintEvent* event)
{ {
if (!mTextNode) if (!mTextNode)
{ {
mTextNode = TextNode::Create(mLabel, Transform({ mSize.mWidth /2.0, mSize.mHeight / 2.0 })); mTextNode = TextNode::Create(mLabel, Transform());
mTextNode->setName(mName + "_TextNode"); mTextNode->setName(mName + "_TextNode");
mTextNode->setContent(mLabel); mTextNode->setContent(mLabel);
mTextNode->setWidth(mSize.mWidth); mTextNode->setWidth(mSize.mWidth);
@ -255,7 +255,7 @@ void Button::updateIcon(const PaintEvent* event)
{ {
if (!mIconNode && mIcon != Resource::Icon::Svg::NONE) if (!mIconNode && mIcon != Resource::Icon::Svg::NONE)
{ {
mIconNode = std::make_unique<IconNode>(Transform()); mIconNode = std::make_unique<IconNode>(Transform(Point(15.0, 8.0), 0.5, 0.5));
mIconNode->setName(mName + "_IconNode"); mIconNode->setName(mName + "_IconNode");
mIconNode->setSvgContent(MediaResourceManager::getSvgIconNode(mIcon)); mIconNode->setSvgContent(MediaResourceManager::getSvgIconNode(mIcon));
mRootNode->addChild(mIconNode.get()); mRootNode->addChild(mIconNode.get());

4
test/graphics/TestD2dRendering.cpp
View file

@ -18,10 +18,10 @@ TEST_CASE(TestD2dRendering, "graphics")
auto gui_app = TestCaseRunner::getInstance().getTestApplication(); auto gui_app = TestCaseRunner::getInstance().getTestApplication();
auto scene = gui_app->getMainWindowScene(); auto scene = gui_app->getMainWindowScene();
auto rect = std::make_unique<RectangleNode>(Point(10, 10), 200.0, 200.0); auto rect = std::make_unique<RectangleNode>(Transform(Point(10, 10)), 200.0, 200.0);
scene->addNode(rect.get()); scene->addNode(rect.get());
auto text_node = std::make_unique<TextNode>("Test2", Point(100, 100)); auto text_node = std::make_unique<TextNode>("Test2", Transform(Point(100, 100)));
scene->addNode(text_node.get()); scene->addNode(text_node.get());
scene->update(); scene->update();

4
test/graphics/TestDirectXRendering.cpp
View file

@ -25,11 +25,11 @@ TEST_CASE(TestDirectXRendering, "graphics")
auto scene = drawing_context->getScene(); auto scene = drawing_context->getScene();
auto mesh = MeshPrimitives::buildRectangleAsTriMesh(); auto mesh = MeshPrimitives::buildRectangleAsTriMesh();
auto mesh_node = std::make_unique<MeshNode>(DiscretePoint(0, 0)); auto mesh_node = std::make_unique<MeshNode>(Transform(DiscretePoint(0, 0)));
mesh_node->setMesh(mesh.get()); mesh_node->setMesh(mesh.get());
scene->addNode(mesh_node.get()); scene->addNode(mesh_node.get());
auto text_node = std::make_unique<TextNode>("Test", DiscretePoint(100, 100)); auto text_node = std::make_unique<TextNode>("Test", Transform(DiscretePoint(100, 100)));
scene->addNode(text_node.get()); scene->addNode(text_node.get());
scene->update(); scene->update();