maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows embedder fixes

Browse Source
This commit is contained in:
Nick Fisher
2024-10-14 11:23:56 +11:00
parent 1135ba054c
commit f9468db266
11 changed files with 91 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_widget_windows.dart
View File

@@ -43,11 +43,16 @@ class _ThermionWidgetWindowsState extends State<ThermionWidgetWindows> {
var dpr = MediaQuery.of(context).devicePixelRatio;
var size = ((context.findRenderObject()) as RenderBox).size;
final renderBox = ((context.findRenderObject()) as RenderBox);
var size = renderBox.size;
var width = (size.width * dpr).ceil();
var height = (size.height * dpr).ceil();
_window = await t.ThermionFlutterPlatform.instance.createWindow(width, height, 0, 0);
final offset = renderBox.localToGlobal(Offset.zero);
final offsetLeft = (offset.dx * dpr).toInt();
final offsetTop = (offset.dy * dpr).toInt();
_window = await t.ThermionFlutterPlatform.instance.createWindow(width, height, offsetLeft, offsetTop);
await widget.view.updateViewport(_window!.width, _window!.height);
@@ -121,11 +126,16 @@ class _ThermionWidgetWindowsState extends State<ThermionWidgetWindows> {
var newWidth = newSize.width.ceil();
var newHeight = newSize.height.ceil();
final renderBox = context.findRenderObject() as RenderBox;
final offset = renderBox.localToGlobal(Offset.zero);
final offsetLeft = (offset.dx * dpr).toInt();
final offsetTop = (offset.dy * dpr).toInt();
await _window?.resize(
newWidth,
newHeight,
0,
0,
offsetLeft,
offsetTop,
);
await widget.view.updateViewport(_window!.width, _window!.height);

11
thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.cpp
View File

@@ -210,7 +210,7 @@ void ThermionFlutterPlugin::DestroyTexture(
void ThermionFlutterPlugin::HandleMethodCall(
const flutter::MethodCall<flutter::EncodableValue> &methodCall,
std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
std::cout << methodCall.method_name().c_str() << std::endl;
// std::cout << methodCall.method_name().c_str() << std::endl;
if (methodCall.method_name() == "usesBackingWindow") {
result->Success(flutter::EncodableValue(
#ifdef WGL_USE_BACKING_WINDOW
@@ -239,13 +239,12 @@ void ThermionFlutterPlugin::HandleMethodCall(
int dHeight = *(std::get_if<int>(&(args->at(1))));
int dLeft = *(std::get_if<int>(&(args->at(2))));
int dTop = *(std::get_if<int>(&(args->at(3))));
auto width = (uint32_t)round(dWidth );
auto height = (uint32_t)round(dHeight );
auto left = (uint32_t)round(dLeft );
auto top = (uint32_t)round(dTop );
auto width = static_cast<uint32_t>(dWidth);
auto height = static_cast<uint32_t>(dHeight);
auto left = static_cast<uint32_t>(dLeft);
auto top = static_cast<uint32_t>(dTop );
_context->ResizeRenderingSurface(width, height, left, top);
std::cout << "resized window to " << width << "x" << height << " at " << left << "," << top << std::endl;
result->Success();
#else
result->Error("ERROR", "resizeWindow is only available when using a backing window");

2
thermion_flutter/thermion_flutter/windows/wgl_context.cpp
View File

@@ -118,7 +118,7 @@ void WGLContext::CreateRenderingSurface(
ResizeRenderingSurface(width, height, left, top);
}
std::cout << "created window size " << width << "x" << height << " at " << left << "," << top << " with backing handle" << _backingWindow->GetHandle() << std::endl;
// std::cout << "created window size " << width << "x" << height << " at " << left << "," << top << " with backing handle" << _backingWindow->GetHandle() << std::endl;
std::vector<flutter::EncodableValue> resultList;
resultList.push_back(flutter::EncodableValue()); // return null for Flutter texture ID
resultList.push_back(flutter::EncodableValue()); // return null for hardware texture ID

6
thermion_flutter/thermion_flutter_ffi/lib/thermion_flutter_windows.dart
View File

@@ -91,7 +91,7 @@ class ThermionFlutterWindowImpl extends ThermionFlutterWindow {
@override
Future destroy() async {
await _channel
.invokeMethod("destroyWindow", [width, height, offsetLeft, offsetLeft]);
.invokeMethod("destroyWindow", this.handle);
}
@override
@@ -112,7 +112,7 @@ class ThermionFlutterWindowImpl extends ThermionFlutterWindow {
throw Exception("Resize underway");
}
if (width == this.width && height == this.height) {
if (width == this.width && height == this.height && this.offsetLeft == offsetLeft && this.offsetTop == offsetTop) {
return;
}
@@ -124,7 +124,7 @@ class ThermionFlutterWindowImpl extends ThermionFlutterWindow {
_resizing = true;
await _channel
.invokeMethod("resizeWindow", [width, height, offsetLeft, offsetLeft]);
.invokeMethod("resizeWindow", [width, height, offsetLeft, offsetTop]);
_resizing = false;
}