[Skim-app-commit] SF.net SVN: skim-app:[12707] trunk

[hofman--- via Skim-app-commit]

Revision: 12707
          http://sourceforge.net/p/skim-app/code/12707
Author:   hofman
Date:     2022-01-12 10:43:12 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
Allow nil transiton info and don't set initial value

Modified Paths:
--------------
    trunk/SKMainWindowController.m
    trunk/SKPresentationOptionsSheetController.m
    trunk/SKTransitionController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2022-01-12 10:35:08 UTC (rev 12706)
+++ trunk/SKMainWindowController.m      2022-01-12 10:43:12 UTC (rev 12707)
@@ -1509,7 +1509,7 @@
     NSArray *pageTransitions = [transitions pageTransitions];
     NSMutableDictionary *options = nil;
     if ([transition transitionStyle] != SKNoTransition || [pageTransitions 
count]) {
-        options = [NSMutableDictionary dictionaryWithDictionary:[transition 
properties]];
+        options = [NSMutableDictionary dictionaryWithDictionary:[(transition 
?: [[[SKTransitionInfo alloc] init] autorelease]) properties]];
         [options setValue:pageTransitions forKey:PAGETRANSITIONS_KEY];
     }
     return options;

Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m        2022-01-12 10:35:08 UTC 
(rev 12706)
+++ trunk/SKPresentationOptionsSheetController.m        2022-01-12 10:43:12 UTC 
(rev 12707)
@@ -173,9 +173,11 @@
 
     SKTransitionController *transitionController = [[controller pdfView] 
transitionController];
     SKTransitionInfo *info = [transitionController transition];
-    [transition setTransitionStyle:[info transitionStyle]];
-    [transition setDuration:[info duration]];
-    [transition setShouldRestrict:[info shouldRestrict]];
+    if (info) {
+        [transition setTransitionStyle:[info transitionStyle]];
+        [transition setDuration:[info duration]];
+        [transition setShouldRestrict:[info shouldRestrict]];
+    }
     [self startObservingTransitions:[NSArray arrayWithObject:transition]];
     
     // collapse the table, it is already hidden

Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m      2022-01-12 10:35:08 UTC (rev 12706)
+++ trunk/SKTransitionController.m      2022-01-12 10:43:12 UTC (rev 12707)
@@ -297,14 +297,6 @@
     return style >= SKCoreImageTransition;
 }
 
-- (id)init {
-    self = [super init];
-    if (self) {
-        transition = [[SKTransitionInfo alloc] init];
-    }
-    return self;
-}
-
 - (void)dealloc {
     view = nil;
     SKDESTROY(transitionView);

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit