Merge pull request #291 from OpenSmalltalk/krono/288-withImageSize

prefer image's saved size over arbitrary defaults if unknown
OpenSmalltalk · Oct 7, 2018 · c8f5070 · c8f5070
2 parents 127f38f + 42e0db0
commit c8f5070
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m b/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m
@@ -68,8 +68,6 @@ - (void) makeMainWindow {
 	windowBlock->handle =   (__bridge void*) createdWindow;
 	windowBlock->context = nil;
 	windowBlock->updateArea = CGRectZero;
-	width  = (usqInt) ioScreenSize() >> 16;
-	height = ioScreenSize() & 0xFFFF;
 
 	setSavedWindowSize( (width << 16) |(height & 0xFFFF));
 	windowBlock->width = width;

diff --git a/platforms/iOS/vm/Common/Classes/sqSqueakNullScreenAndWindow.m b/platforms/iOS/vm/Common/Classes/sqSqueakNullScreenAndWindow.m
@@ -67,7 +67,9 @@ - (double) ioSceenScaleFactor {
 }
 
 - (sqInt) ioScreenSize {
-    return (10 << 16) | (10 & 0xFFFF);  /* w is high 16 bits; h is low 16 bits */
+    extern sqInt getSavedWindowSize(void); //This is VM Callback
+    sqInt savedSize = getSavedWindowSize();
+    return savedSize ?  savedSize : (64 << 16) | (64 & 0xFFFF);  /* w is high 16 bits; h is low 16 bits */
 }
 
 - (sqInt) ioScreenDepth {

diff --git a/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m b/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m
@@ -91,13 +91,13 @@ - (sqInt) ioScreenSize {
 	sqInt w, h;
 
 #if BUILD_FOR_OSX
-		NSRect screenSize = [gDelegateApp.mainView bounds];
+	NSRect screenSize = [gDelegateApp.mainView bounds];
 #else
-		CGRect screenSize = [gDelegateApp.mainView bounds];
+	CGRect screenSize = [gDelegateApp.mainView bounds];
 #endif
 
-		w = (sqInt) screenSize.size.width;
-		h = (sqInt) screenSize.size.height;
+	w = (sqInt) screenSize.size.width;
+	h = (sqInt) screenSize.size.height;
 
 	return (w << 16) | (h & 0xFFFF);  /* w is high 16 bits; h is low 16 bits */
 

diff --git a/platforms/iOS/vm/OSX/sqMacV2Window.m b/platforms/iOS/vm/OSX/sqMacV2Window.m
@@ -53,11 +53,9 @@ void makeMainWindow(void) {
 	width  = (unsigned) getSavedWindowSize() >> 16;
 	height = getSavedWindowSize() & 0xFFFF;
 	windowBlock = AddWindowBlock();
-	windowBlock-> handle = gDelegateApp.window;
+	windowBlock->handle = gDelegateApp.window;
 	windowBlock->context = nil;
 	windowBlock->updateArea = CGRectZero;
-	width  = (usqInt) ioScreenSize() >> 16;
-	height = ioScreenSize() & 0xFFFF;
 
 	setSavedWindowSize( (width << 16) |(height & 0xFFFF));
 	windowBlock->width = width;

diff --git a/platforms/iOS/vm/OSX/sqSqueakMainApplication+screen.m b/platforms/iOS/vm/OSX/sqSqueakMainApplication+screen.m
@@ -52,11 +52,13 @@ - (sqInt) ioScreenSize {
 	sqInt w, h;
 	sqInt browserGetWindowSize(void);
 	void makeMainWindow(void);
+	extern sqInt getSavedWindowSize(void); //This is VM Callback
 	sqInt getCurrentIndexInUse(void);
 	extern BOOL gSqueakExplicitWindowOpenNeeded;	
+	sqInt savedSize = getSavedWindowSize();
 
 	if (gSqueakHeadless && !browserActiveAndDrawingContextOk()) 
-		return ((16 << 16) | 16);
+		return savedSize ? savedSize : ((64 << 16) | 64);
 
 	if (browserActiveAndDrawingContextOkAndNOTInFullScreenMode())
 		return browserGetWindowSize();