Middle click and drag in stage should take precedence

Author: BrentFarris

src/editor/editor_stage_manager/editor_stage_view/editor_stage_view.go

@@ -79,6 +79,17 @@ func (v *StageView) IsFlyCameraInputActive() bool {
 		(m.Pressed(hid.MouseButtonRight) || m.Held(hid.MouseButtonRight))
 }
 
+// IsCameraPanInputStarting reports the middle-button press that must reach the
+// camera on this frame so it can initialize its drag state.
+func (v *StageView) IsCameraPanInputStarting() bool {
+	if !v.open || v.host == nil || v.host.Window == nil {
+		return false
+	}
+	m := &v.host.Window.Mouse
+	return m.Pressed(hid.MouseButtonMiddle) &&
+		v.viewportContainsScreenPosition(m.ScreenPosition())
+}
+
 func (v *StageView) SetViewportToolOwner(owner ViewportToolOwner) {
 	v.toolOwner = owner
 }

src/editor/editor_stage_manager/editor_stage_view/stage_viewport_test.go

@@ -13,6 +13,8 @@ import (
 	"kaijuengine.com/engine"
 	"kaijuengine.com/engine/ui"
 	"kaijuengine.com/matrix"
+	"kaijuengine.com/platform/hid"
+	"kaijuengine.com/platform/windowing"
 	"kaijuengine.com/rendering"
 )
 
@@ -49,6 +51,27 @@ func TestStageViewportBoundsConvertsScreenBoxToLocalBottomArea(t *testing.T) {
 	}
 }
 
+func TestStageViewDetectsCameraPanStartInsideViewport(t *testing.T) {
+	t.Parallel()
+
+	window := &windowing.Window{Mouse: hid.NewMouse()}
+	window.Mouse.SetPosition(50, 50, 200, 100)
+	window.Mouse.SetDown(hid.MouseButtonMiddle)
+	view := StageView{
+		host:     &engine.Host{Window: window},
+		open:     true,
+		viewport: stageViewportBounds{Left: 25, Top: 25, Width: 100, Height: 50},
+	}
+
+	if !view.IsCameraPanInputStarting() {
+		t.Fatal("middle press inside the stage viewport did not start camera pan input")
+	}
+	view.viewport = stageViewportBounds{Left: 125, Top: 25, Width: 50, Height: 50}
+	if view.IsCameraPanInputStarting() {
+		t.Fatal("middle press outside the stage viewport started camera pan input")
+	}
+}
+
 func TestStageTargetResizeFollowsViewportPanelSize(t *testing.T) {
 	t.Parallel()
 

src/editor/editor_workspace/stage_workspace/stage_workspace.go

@@ -255,7 +255,11 @@ func (w *StageWorkspace) Update(deltaTime float64) {
 		return
 	}
 	w.stageView.SyncStageViewport()
-	if w.UiMan.Group.HasRequests() {
+	resumeCameraPan := w.IsFocusedOnInput() && w.stageView.IsCameraPanInputStarting()
+	if resumeCameraPan {
+		w.UiMan.Group.ClearFocus()
+	}
+	if w.UiMan.Group.HasRequests() && !resumeCameraPan {
 		return
 	}
 	if !w.IsFocusedOnInput() {

src/engine/ui/group.go

@@ -101,6 +101,12 @@ func (group *Group) IsFocusedOnInput() bool {
 	return group.focus.IsType(ElementTypeInput) || group.focus.IsType(ElementTypeTextArea)
 }
 
+// ClearFocus releases the currently focused element through its normal miss
+// handler so inputs can submit and blur just as they do when clicking elsewhere.
+func (group *Group) ClearFocus() {
+	group.setFocus(nil)
+}
+
 func (group *Group) Attach(host *engine.Host) {
 	wGroup := weak.Make(group)
 	group.updateId = host.UILateUpdater.AddUpdate(func(dt float64) {

src/engine/ui/group_test.go

@@ -77,3 +77,21 @@ func TestGroupLateUpdateDispatchesFocusAndBlur(t *testing.T) {
 		t.Fatalf("lateUpdate did not clear dispatched focus requests")
 	}
 }
+
+func TestGroupClearFocusDispatchesMiss(t *testing.T) {
+	t.Parallel()
+
+	target := &UI{}
+	missed := false
+	target.events[EventTypeMiss].Add(func() { missed = true })
+	group := Group{focus: target}
+
+	group.ClearFocus()
+
+	if !missed {
+		t.Fatal("clearing focus did not dispatch a miss event")
+	}
+	if group.focus != nil {
+		t.Fatal("clearing focus retained the focused element")
+	}
+}