Skip to content

Commit 94f5d3c

Browse files
committed
Fix scale factor for vertical dimensions
1 parent 503373e commit 94f5d3c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Amethyst/Layout/Layouts/CustomLayout.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,20 +216,23 @@ class CustomLayout<Window: WindowType>: StatefulLayout<Window>, PanedLayout {
216216
return nil
217217
}
218218

219-
let isMain = frame.objectForKeyedSubscript("isMain")?.toBool() ?? true
220-
let scaleFactor = screenFrame.width / frame.toRoundedRect().width
221219
var unconstrainedDimension: UnconstrainedDimension = .horizontal
220+
var scaleFactor = screenFrame.width / frame.toRoundedRect().width
221+
222222
if let dimension = frame.objectForKeyedSubscript("unconstrainedDimension")?.toString() {
223223
switch dimension {
224224
case "horizontal":
225225
unconstrainedDimension = .horizontal
226226
case "vertical":
227227
unconstrainedDimension = .vertical
228+
scaleFactor = screenFrame.height / frame.toRoundedRect().height
228229
default:
229230
log.warning("Encountered unknown unconstrainedDimension value: \(dimension), defaulting to horizontal")
230231
unconstrainedDimension = .horizontal
231232
}
232233
}
234+
235+
let isMain = frame.objectForKeyedSubscript("isMain")?.toBool() ?? true
233236
let resizeRules = ResizeRules(isMain: isMain, unconstrainedDimension: unconstrainedDimension, scaleFactor: scaleFactor)
234237
let frameAssignment = FrameAssignment<Window>(
235238
frame: frame.toRoundedRect(),

0 commit comments

Comments
 (0)