Skip to content

Commit

Permalink
Merge branch 'develop' into enhancement/add_substance_designer_support
Browse files Browse the repository at this point in the history
  • Loading branch information
moonyuet authored Jan 21, 2025
2 parents 86469d0 + e54ec4e commit 81e861d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions client/ayon_core/style/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ Enabled vs Disabled logic in most of stylesheets
font-family: "Noto Sans";
font-weight: 450;
outline: none;

/* Define icon size to fix size issues for most of DCCs */
icon-size: 16px;
}

QWidget {
Expand Down
6 changes: 5 additions & 1 deletion client/ayon_core/tools/workfiles/widgets/files_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ def __init__(self, controller, parent):

# Initial setup
workarea_btn_open.setEnabled(False)
workarea_btn_browse.setEnabled(False)
workarea_btn_save.setEnabled(False)
published_btn_copy_n_open.setEnabled(False)
published_btn_change_context.setEnabled(False)
published_btn_cancel.setVisible(False)
Expand Down Expand Up @@ -278,8 +280,9 @@ def _update_published_btns_state(self):
self._published_btn_change_context.setEnabled(enabled)

def _update_workarea_btns_state(self):
enabled = self._is_save_enabled
enabled = self._is_save_enabled and self._valid_selected_context
self._workarea_btn_save.setEnabled(enabled)
self._workarea_btn_browse.setEnabled(self._valid_selected_context)

def _on_published_repre_changed(self, event):
self._valid_representation_id = event["representation_id"] is not None
Expand All @@ -294,6 +297,7 @@ def _on_task_changed(self, event):
and self._selected_task_id is not None
)
self._update_published_btns_state()
self._update_workarea_btns_state()

def _on_published_save_clicked(self):
result = self._exec_save_as_dialog()
Expand Down

0 comments on commit 81e861d

Please sign in to comment.