All checks were successful
CI / Windows build (push) Successful in 13m24s
Zoom jumping (device: min 0.5 / max 2.47 while zooming near 1): the per-frame scale clamp limited single-frame spikes but not multi-frame runs. Root cause is pointer-count transitions — on Windows touch the two fingers land/lift at different times and digitizers drop/re-acquire touches, and stock InteractiveViewer keeps _scaleStart/_referenceFocalPoint from the OLD finger set, so the next frame jumps. PenInteractiveViewer now re-baselines (and skips the transitional frame) whenever details.pointerCount changes. The per-frame clamp stays as a secondary guard. Buttons (device evidence: btn=1 for tip-down, side-button, AND inverted; kind never becomes invertedStylus): Flutter does NOT surface the barrel/eraser/inverted state at all — unreachable from Dart. The only path is the native badnote/pen plugin, which was SILENT because WM_POINTER is delivered to the Flutter CHILD view window, not the top-level FlutterWindow where ObservePenMessage was hooked. Fix: subclass the child HWND (SetWindowSubclass + comctl32) and observe its WM_POINTER messages, passing every message through unchanged via DefSubclassProc (observation-only, input behavior preserved). This is what should finally feed GetPointerPenInfo penFlags + tilt to the channel — to be confirmed on-device with the diagnostic (btn / kind / tilt readout). Dart: analyze clean, 66/66 tests, linux build green. Native compiles on Windows CI. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
117 lines
3.9 KiB
C++
117 lines
3.9 KiB
C++
#include "flutter_window.h"
|
|
|
|
#include <commctrl.h>
|
|
|
|
#include <optional>
|
|
|
|
#include "flutter/generated_plugin_registrant.h"
|
|
#include "ocr_channel.h"
|
|
#include "pen_channel.h"
|
|
|
|
// SetWindowSubclass / DefSubclassProc / RemoveWindowSubclass live in comctl32.
|
|
#pragma comment(lib, "comctl32.lib")
|
|
|
|
namespace {
|
|
|
|
// Id for the pen observer subclass installed on the Flutter child view window.
|
|
constexpr UINT_PTR kPenSubclassId = 1;
|
|
|
|
// Subclass proc on the FLUTTER CHILD window. WM_POINTER messages are delivered
|
|
// to the window under the pointer — that is the Flutter view's child HWND, not
|
|
// the top-level window — so this is where the pen's barrel/eraser/tilt actually
|
|
// arrive. We observe (non-consuming) and pass every message straight through to
|
|
// Flutter's own handler via DefSubclassProc, so input behavior is unchanged.
|
|
LRESULT CALLBACK FlutterChildSubclassProc(HWND hwnd, UINT message,
|
|
WPARAM wparam, LPARAM lparam,
|
|
UINT_PTR /*subclass_id*/,
|
|
DWORD_PTR /*ref_data*/) {
|
|
ObservePenMessage(message, wparam, lparam);
|
|
return DefSubclassProc(hwnd, message, wparam, lparam);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
FlutterWindow::FlutterWindow(const flutter::DartProject& project)
|
|
: project_(project) {}
|
|
|
|
FlutterWindow::~FlutterWindow() {}
|
|
|
|
bool FlutterWindow::OnCreate() {
|
|
if (!Win32Window::OnCreate()) {
|
|
return false;
|
|
}
|
|
|
|
RECT frame = GetClientArea();
|
|
|
|
// The size here must match the window dimensions to avoid unnecessary surface
|
|
// creation / destruction in the startup path.
|
|
flutter_controller_ = std::make_unique<flutter::FlutterViewController>(
|
|
frame.right - frame.left, frame.bottom - frame.top, project_);
|
|
// Ensure that basic setup of the controller was successful.
|
|
if (!flutter_controller_->engine() || !flutter_controller_->view()) {
|
|
return false;
|
|
}
|
|
RegisterPlugins(flutter_controller_->engine());
|
|
RegisterOcrChannel(flutter_controller_->engine());
|
|
RegisterPenChannel(flutter_controller_->engine());
|
|
|
|
HWND flutter_child = flutter_controller_->view()->GetNativeWindow();
|
|
SetChildContent(flutter_child);
|
|
|
|
// Observe WM_POINTER on the Flutter child window (where pen messages land) so
|
|
// the pen barrel/eraser/inverted flags + tilt reach the badnote/pen channel.
|
|
if (flutter_child) {
|
|
SetWindowSubclass(flutter_child, FlutterChildSubclassProc, kPenSubclassId, 0);
|
|
}
|
|
|
|
flutter_controller_->engine()->SetNextFrameCallback([&]() {
|
|
this->Show();
|
|
});
|
|
|
|
// Flutter can complete the first frame before the "show window" callback is
|
|
// registered. The following call ensures a frame is pending to ensure the
|
|
// window is shown. It is a no-op if the first frame hasn't completed yet.
|
|
flutter_controller_->ForceRedraw();
|
|
|
|
return true;
|
|
}
|
|
|
|
void FlutterWindow::OnDestroy() {
|
|
if (flutter_controller_) {
|
|
HWND flutter_child = flutter_controller_->view()->GetNativeWindow();
|
|
if (flutter_child) {
|
|
RemoveWindowSubclass(flutter_child, FlutterChildSubclassProc,
|
|
kPenSubclassId);
|
|
}
|
|
flutter_controller_ = nullptr;
|
|
}
|
|
|
|
Win32Window::OnDestroy();
|
|
}
|
|
|
|
LRESULT
|
|
FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
|
|
WPARAM const wparam,
|
|
LPARAM const lparam) noexcept {
|
|
// Observe pen messages before Flutter consumes WM_POINTER events.
|
|
ObservePenMessage(message, wparam, lparam);
|
|
|
|
// Give Flutter, including plugins, an opportunity to handle window messages.
|
|
if (flutter_controller_) {
|
|
std::optional<LRESULT> result =
|
|
flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
|
|
lparam);
|
|
if (result) {
|
|
return *result;
|
|
}
|
|
}
|
|
|
|
switch (message) {
|
|
case WM_FONTCHANGE:
|
|
flutter_controller_->engine()->ReloadSystemFonts();
|
|
break;
|
|
}
|
|
|
|
return Win32Window::MessageHandler(hwnd, message, wparam, lparam);
|
|
}
|