From f01517d1845deae4d5e830d48d51c15a9afc2148 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 20 Apr 2019 11:11:09 -0500 Subject: [PATCH] Remove indent attribute as we should have been using indentionLevel. --- iOS/Master/Cell/MasterTableViewCell.swift | 10 +--------- iOS/Master/MasterViewController.swift | 4 +++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/iOS/Master/Cell/MasterTableViewCell.swift b/iOS/Master/Cell/MasterTableViewCell.swift index 2ec5a9aa8..b8b95acd5 100644 --- a/iOS/Master/Cell/MasterTableViewCell.swift +++ b/iOS/Master/Cell/MasterTableViewCell.swift @@ -32,14 +32,6 @@ class MasterTableViewCell : UITableViewCell { } } - var indent = false { - didSet { - if indent != oldValue { - setNeedsLayout() - } - } - } - var disclosureExpanded = false { didSet { updateDisclosureImage() @@ -120,7 +112,7 @@ class MasterTableViewCell : UITableViewCell { override func layoutSubviews() { super.layoutSubviews() - let layout = MasterTableViewCellLayout(cellSize: bounds.size, shouldShowImage: shouldShowImage, label: titleView, unreadCountView: unreadCountView, showingEditingControl: showingEditControl, indent: indent, shouldShowDisclosure: !showsReorderControl) + let layout = MasterTableViewCellLayout(cellSize: bounds.size, shouldShowImage: shouldShowImage, label: titleView, unreadCountView: unreadCountView, showingEditingControl: showingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: !showsReorderControl) layoutWith(layout) } diff --git a/iOS/Master/MasterViewController.swift b/iOS/Master/MasterViewController.swift index dcd36b864..579805247 100644 --- a/iOS/Master/MasterViewController.swift +++ b/iOS/Master/MasterViewController.swift @@ -487,7 +487,9 @@ class MasterViewController: UITableViewController, UndoableCommandRunner { func configure(_ cell: MasterTableViewCell, _ node: Node) { cell.delegate = self - cell.indent = node.parent?.representedObject is Folder + if node.parent?.representedObject is Folder { + cell.indentationLevel = 1 + } cell.disclosureExpanded = expandedNodes.contains(node) cell.allowDisclosureSelection = node.canHaveChildNodes