Merge pull request #1165 from cogentcore/nonmodal

Nonmodal dialog support for web NewWindow Dialogs

core/events.go

@@ -251,11 +251,13 @@ func (em *Events) handlePosEvent(e events.Event) {
 		if em.spriteSlide != nil {
 			em.spriteSlide.handleEvent(e)
 			em.spriteSlide.send(events.SlideMove, e)
+			e.SetHandled()
 			return
 		}
 		if em.slide != nil {
 			em.slide.AsWidget().HandleEvent(e)
 			em.slide.AsWidget().Send(events.SlideMove, e)
+			e.SetHandled()
 			return
 		}
 	case events.Scroll:
@@ -400,16 +402,19 @@ func (em *Events) handlePosEvent(e events.Event) {
 			em.dragMove(e)                              // updates sprite position
 			em.drag.AsWidget().HandleEvent(e)           // raw drag
 			em.drag.AsWidget().Send(events.DragMove, e) // usually ignored
+			e.SetHandled()
 		} else {
 			if em.dragPress != nil && em.dragStartCheck(e, DeviceSettings.DragStartTime, DeviceSettings.DragStartDistance) {
 				em.cancelRepeatClick()
 				em.cancelLongPress()
 				em.dragPress.AsWidget().Send(events.DragStart, e)
+				e.SetHandled()
 			} else if em.slidePress != nil && em.dragStartCheck(e, DeviceSettings.SlideStartTime, DeviceSettings.DragStartDistance) {
 				em.cancelRepeatClick()
 				em.cancelLongPress()
 				em.slide = em.slidePress
 				em.slide.AsWidget().Send(events.SlideStart, e)
+				e.SetHandled()
 			}
 		}
 		// if we already have a long press widget, we update it based on our dragging movement
@@ -420,6 +425,7 @@ func (em *Events) handlePosEvent(e events.Event) {
 		em.cancelRepeatClick()
 		if em.slide != nil {
 			em.slide.AsWidget().Send(events.SlideStop, e)
+			e.SetHandled()
 			em.slide = nil
 			em.press = nil
 		}

core/handle.go

@@ -62,6 +62,7 @@ func (hl *Handle) Init() {
 	})
 
 	hl.On(events.SlideMove, func(e events.Event) {
+		e.SetHandled()
 		pos := hl.parentWidget().PointToRelPos(e.Pos())
 		hl.Pos = math32.FromPoint(pos).Dim(hl.Styles.Direction.Dim())
 		hl.SendChange(e)

core/mainstage.go

@@ -165,17 +165,24 @@ func (st *Stage) firstWindowStages() *stages {
 
 // configMainStage does main-stage configuration steps
 func (st *Stage) configMainStage() {
+	sc := st.Scene
 	if st.NewWindow {
 		st.FullWindow = true
 	}
-	// if we are on mobile, we can never have new windows
 	if TheApp.Platform().IsMobile() {
+		// If we are a new window dialog on a large single-window platform,
+		// we use a modeless dialog as a substitute.
+		if st.NewWindow && st.Type == DialogStage && st.Context != nil && st.Context.AsWidget().SizeClass() != SizeCompact {
+			st.FullWindow = false
+			st.Modal = false
+			st.Scrim = false
+		}
+		// If we are on mobile, we can never have new windows.
 		st.NewWindow = false
 	}
 	if st.FullWindow || st.NewWindow {
 		st.Scrim = false
 	}
-	sc := st.Scene
 	sc.makeSceneBars()
 	sc.updateScene()
 }
@@ -398,5 +405,13 @@ func (sm *stages) mainHandleEvent(e events.Event) {
 		if e.IsHandled() || st.Modal || st.Type == WindowStage || st.FullWindow {
 			break
 		}
+		if st.Type == DialogStage { // modeless dialog, by definition
+			if e.HasPos() && st.Scene != nil {
+				b := st.Scene.SceneGeom.Bounds()
+				if e.WindowPos().In(b) { // don't propagate
+					break
+				}
+			}
+		}
 	}
 }

core/style.go

@@ -225,4 +225,7 @@ func styleFromTags(w Widget, tags reflect.StructTag) {
 		setFromTag(tags, "grow", func(v float32) { s.Grow.X = v })
 		setFromTag(tags, "grow-y", func(v float32) { s.Grow.Y = v })
 	})
+	if tags.Get("new-window") == "+" {
+		w.AsWidget().setFlag(true, widgetValueNewWindow)
+	}
 }

core/value.go

@@ -116,7 +116,9 @@ func InitValueButton(v Value, allowReadOnly bool, make func(d *Body), after ...f
 	}
 	wb.OnClick(func(e events.Event) {
 		if allowReadOnly || !wb.IsReadOnly() {
-			wb.setFlag(e.HasAnyModifier(key.Shift), widgetValueNewWindow)
+			if e.HasAnyModifier(key.Shift) {
+				wb.setFlag(!wb.hasFlag(widgetValueNewWindow), widgetValueNewWindow)
+			}
 			openValueDialog(v, make, after...)
 		}
 	})

xyz/xyzcore/manip.go

@@ -218,6 +218,7 @@ func (sw *Scene) handleSelectEventsImpl(e events.Event) {
 
 func (sw *Scene) handleSlideEvents() {
 	sw.On(events.SlideMove, func(e events.Event) {
+		e.SetHandled()
 		pos := sw.Geom.ContentBBox.Min
 		e.SetLocalOff(e.LocalOff().Add(pos))
 		xy := sw.XYZ