fixed bug when closing presentation and slide is at the false position

BraunTom · BraunTom · commit 33f59f32761d · 2018-06-04T17:37:17.000+02:00
diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/extent..st b/packages/Presenter-Core.package/PSSlide.class/instance/extent..st
diff --git a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json
@@ -7,7 +7,6 @@
 		"disablePresentationMode" : "MK 5/25/2018 16:13",
 		"doubleClick:" : "LM 5/25/2018 17:20",
 		"enablePresentationMode" : "MK 5/25/2018 15:11",
-		"extent:" : "LB 5/25/2018 16:31",
 		"handleDroppedImage:event:" : "LB 5/18/2018 17:38",
 		"handleDroppedItem:event:" : "LB 5/18/2018 17:33",
 		"handlesMouseDown:" : "WoC 5/22/2018 19:23",
diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/disablePresentationMode.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/disablePresentationMode.st
@@ -2,8 +2,7 @@ presentation mode
 disablePresentationMode
 
 	DisplayScreen fullScreenOff.
-	self ensurePreviousOwnerIsNotSubmorph.
+	"self ensurePreviousOwnerIsNotSubmorph."
 	self previousOwner 
-		addMorph: self 
-		fullFrame: (LayoutFrame fractions: (0@0 corner: 1@1)).
-	self color: self defaultColor
+		addMorph: self.
+	self color: self defaultColor
diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st
@@ -5,7 +5,7 @@ enablePresentationMode
 	DisplayScreen fullScreenOn.
 	self owner removeMorph: self.
 	self 
-		openInWorld;
+		openInWorld: self previousOwner world;
 		position: 0@0;
-		extent: World extent;
+		extent: self world extent;
 		color: Color black
diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/initialize.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/initialize.st
@@ -3,7 +3,7 @@ initialize
 
 	super initialize.
 	self 
-		layoutPolicy: ProportionalLayout new;
+		layoutPolicy: PSSlideLayout new;
 		beSticky;
 		beTransparent;
 		borderColor: nil;
diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/lookUnfocused.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/lookUnfocused.st
@@ -0,0 +1,3 @@
+presentation mode
+lookUnfocused
+	"see comment in #isSystemWindow"
diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json
@@ -2,19 +2,20 @@
 	"class" : {
 		 },
 	"instance" : {
-		"beKeyWindow" : "WoC 6/2/2018 23:38",
+		"beKeyWindow" : "WoC 6/3/2018 00:10",
 		"createSlideDummy" : "MK 5/6/2018 16:12",
 		"currentSlide" : "MK 5/6/2018 13:56",
 		"currentSlide:" : "MK 5/6/2018 15:51",
 		"defaultColor" : "MK 5/25/2018 15:41",
-		"disablePresentationMode" : "LM 6/1/2018 20:13",
-		"enablePresentationMode" : "MK 5/25/2018 15:32",
+		"disablePresentationMode" : "WoC 6/4/2018 17:13",
+		"enablePresentationMode" : "WoC 6/4/2018 16:09",
 		"ensurePreviousOwnerIsNotSubmorph" : "LM 6/1/2018 20:13",
 		"handlesKeyboard:" : "MK 5/25/2018 16:08",
-		"initialize" : "LM 5/25/2018 16:43",
-		"isSystemWindow" : "WoC 6/2/2018 23:39",
+		"initialize" : "WoC 6/4/2018 16:50",
+		"isSystemWindow" : "WoC 6/4/2018 17:35",
 		"keyStroke:" : "MK 5/31/2018 10:10",
-		"makeMeVisible" : "WoC 6/2/2018 23:38",
+		"lookUnfocused" : "WoC 6/4/2018 17:13",
+		"makeMeVisible" : "WoC 6/3/2018 00:10",
 		"previousOwner" : "MK 5/25/2018 15:31",
 		"previousOwner:" : "MK 5/25/2018 15:32",
 		"showSlide:" : "LB 5/6/2018 16:49" } }
diff --git a/packages/Presenter-Core.package/PSSlideLayout.class/README.md b/packages/Presenter-Core.package/PSSlideLayout.class/README.md
diff --git a/packages/Presenter-Core.package/PSSlideLayout.class/instance/layout.in..st b/packages/Presenter-Core.package/PSSlideLayout.class/instance/layout.in..st
@@ -0,0 +1,15 @@
+layout
+layout: morph in: newBounds
+
+	| slide newExtent diffExtent proposedExtent |
+	super layout: morph in: newBounds.
+
+	slide := morph firstSubmorph.
+	proposedExtent := newBounds extent.	
+	proposedExtent y / proposedExtent x > slide sideRatio
+		ifTrue: [newExtent := proposedExtent x @ (proposedExtent x * slide sideRatio)]
+		ifFalse: [newExtent := proposedExtent y / slide sideRatio @ proposedExtent y].
+	diffExtent := proposedExtent - newExtent.
+
+	slide extent: newExtent; center: morph center.
+	slide submorphsDo: [:each | each notifySlideRescale: newExtent]
diff --git a/packages/Presenter-Core.package/PSSlideLayout.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideLayout.class/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"layout:in:" : "WoC 6/4/2018 16:54" } }
diff --git a/packages/Presenter-Core.package/PSSlideLayout.class/properties.json b/packages/Presenter-Core.package/PSSlideLayout.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Presenter-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "PSSlideLayout",
+	"pools" : [
+		 ],
+	"super" : "ProportionalLayout",
+	"type" : "normal" }
diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json
@@ -7,6 +7,6 @@
 		"tearDown" : "LB 6/1/2018 18:21",
 		"testContextMenu" : "MK 6/1/2018 19:45",
 		"testLocalFontColor" : "LB 6/1/2018 18:35",
-		"testTextFieldRescale" : "LB 6/1/2018 18:21",
+		"testTextFieldRescale" : "WoC 6/4/2018 17:22",
 		"textField" : "LB 6/1/2018 18:21",
 		"textField:" : "LB 6/1/2018 17:57" } }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+presentation mode`
	`2`	`+lookUnfocused`
	`3`	`+ "see comment in #isSystemWindow"`