apply default styles

pixijs · Jul 29, 2023 · 2be3911 · 2be3911
1 parent 8303da5
commit 2be3911
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Layout.ts b/src/Layout.ts
@@ -124,13 +124,22 @@ export class LayoutSystem
         {
             this.dpr = 'portrait';
 
-            this.setStyles(this.options.styles.portrait);
+            const defaultStyles = { ...this.options.styles };
+
+            defaultStyles.portrait = undefined;
+
+            this.setStyles({ ...defaultStyles, ...this.options.styles.portrait });
         }
 
         if (this.dpr !== 'landscape' && this.options?.styles?.landscape && parentHeight < parentWidth)
         {
             this.dpr = 'landscape';
-            this.setStyles(this.options.styles.landscape);
+
+            const defaultStyles = { ...this.options.styles };
+
+            defaultStyles.landscape = undefined;
+
+            this.setStyles({ ...defaultStyles, ...this.options.styles.landscape });
         }
 
         this.size.update(parentWidth, parentHeight);

diff --git a/src/stories/styles/ConditionalStyles.stories.ts b/src/stories/styles/ConditionalStyles.stories.ts
@@ -69,10 +69,11 @@ class LayoutStory
                 }
             },
             styles: {
-                width: `80%`,
-                height: `80%`,
+                width: `60%`,
+                height: `60%`,
                 position: 'center',
                 overflow: 'hidden',
+                borderRadius: 20,
                 portrait: {
                     background: portraitColor,
                 },