Migrate to latest dependency releases, and fixed breaking changes.

This commit is contained in:
2024-10-11 11:45:23 -04:00
parent 00818e4656
commit 48aaff669e
2 changed files with 21 additions and 6 deletions

View File

@@ -33,27 +33,27 @@ set_target_properties(JUI PROPERTIES LINKER_LANGUAGE CXX)
CPMAddPackage(
NAME Event
URL https://git.redacted.cc/josh/Event/archive/Release-10.zip
URL https://git.redacted.cc/josh/Event/archive/Release-12.zip
)
CPMAddPackage(
NAME J3ML
URL https://git.redacted.cc/josh/j3ml/archive/Release-3.1.zip
URL https://git.redacted.cc/josh/j3ml/archive/Release-3.2.zip
)
CPMAddPackage(
NAME jlog
URL https://git.redacted.cc/josh/jlog/archive/Prerelease-12.zip
URL https://git.redacted.cc/josh/jlog/archive/Prerelease-16.zip
)
CPMAddPackage(
NAME ReWindow
URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-13.zip
URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-21.zip
)
CPMAddPackage(
NAME JGL
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-32.zip
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-35.zip
)
target_include_directories(JUI PUBLIC ${Event_SOURCE_DIR}/include)

View File

@@ -174,7 +174,7 @@ JUI::Scene* CreateScene() {
text->SetTextSize(48);
text->SetTextColor({255, 0, 0});
auto darkie = new Image(win_element->GetViewportInstance(), sample_texture);
auto darkie = new JUI::Image(win_element->GetViewportInstance(), sample_texture);
darkie->FitImageToParent(true);
darkie->Color({255,255,255,128});
@@ -226,6 +226,21 @@ public:
return true;
}
void OnMouseButtonUp(const ReWindow::WindowEvents::MouseButtonUpEvent &) override
{
}
void OnMouseButtonDown(const ReWindow::WindowEvents::MouseButtonDownEvent &) override
{
}
void OnMouseMove(const ReWindow::WindowEvents::MouseMoveEvent &) override
{
}
//bool OnResizeRequest(const ReWindow::WindowResizeRequestEvent &e) override {}
JUIDevelopmentTestWindow() : ReWindow::RWindow() {}
};