Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: show expand indicator when item only have children that are not tasks #191

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ def _build_item_tree_r(self, item, checked, level, tree_parent):
ui_task = TreeNodeTask(task, ui_item)
self.__created_items.append(ui_task)

for child in item.children:
self._build_item_tree_r(child, checked, level + 1, ui_item)

# ensure the expand indicator is shown/hidden depending on child
# visibility
ui_item.update_expand_indicator()

for child in item.children:
self._build_item_tree_r(child, checked, level + 1, ui_item)

# lastly, handle the item level check state.
# if the item has been marked as checked=False
# uncheck it now (which will affect all children)
Expand Down
11 changes: 11 additions & 0 deletions python/tk_multi_publish2/publish_tree_widget/tree_node_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ def set_check_state(self, state, apply_to_all_plugins=False):
"""
Called by child item when checkbox was ticked
"""
if not self._task.visible or not self._task.enabled:
return

# Ensure that we set the task to match the UI state
self._task.active = state != QtCore.Qt.Unchecked

Expand All @@ -74,6 +77,14 @@ def set_check_state(self, state, apply_to_all_plugins=False):
# set just this one
super(TreeNodeTask, self).set_check_state(state)

def _set_check_state_r(self, state):
if not self._task.visible or not self._task.enabled:
if self.parent():
self.parent().recompute_check_state()
return

super(TreeNodeTask, self)._set_check_state_r(state)

@property
def task(self):
"""
Expand Down
Loading