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
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,8 @@ list(APPEND platform_INCLUDES
server/win32/Win32WebResponse.cpp
server/win32/Win32Buffer.h
server/win32/Win32Buffer.cpp
client/win32/WinInetClient.h
client/win32/WinInetClient.cpp
)
list(APPEND platform_LIBS Httpapi.lib)
endif()
@ -43,6 +45,7 @@ target_include_directories(${MODULE_NAME} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/sockets
${CMAKE_CURRENT_SOURCE_DIR}/web
${CMAKE_CURRENT_SOURCE_DIR}/server/win32
${CMAKE_CURRENT_SOURCE_DIR}/client/win32
)
set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
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)
{
//mTextItem->updateTransform({mLocation});
//mTextItem->setTextWidth(mWidth);
//mTextItem->setTextHeight(mHeight);
//mTransformIsDirty = false;
mTextItem->setTextWidth(mWidth);
mTextItem->setTextHeight(mHeight);
mTransformIsDirty = false;
}
if (mMaterialIsDirty)

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

@ -220,7 +220,7 @@ void Button::updateLabel(const PaintEvent* event)
{
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->setContent(mLabel);
mTextNode->setWidth(mSize.mWidth);
@ -255,7 +255,7 @@ void Button::updateIcon(const PaintEvent* event)
{
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->setSvgContent(MediaResourceManager::getSvgIconNode(mIcon));
mRootNode->addChild(mIconNode.get());