Skip to content

Conversation

@tytan652
Copy link
Collaborator

Description

Dependency of:

Groundwork for other PRs and also avoid creating QActions by using the one included in the dock by modifying its connections making it usable even while the docks are locked.

Motivation and Context

Preparation for PRs that depends on this one.

How Has This Been Tested?

  • Test docks toggle with docks locked or not
  • Connect to services integration
  • Modify custom browser docks

Types of changes

  • Tweak (non-breaking change to improve existing functionality)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@tytan652 tytan652 added Enhancement Improvement to existing functionality Seeking Testers Build artifacts on CI and removed Seeking Testers Build artifacts on CI labels Oct 22, 2022
@tytan652 tytan652 added the Seeking Testers Build artifacts on CI label Oct 22, 2022
@tytan652 tytan652 added this to the OBS Studio 29.1 milestone Nov 20, 2022
@WizardCM WizardCM self-requested a review December 10, 2022 23:20
@tytan652 tytan652 force-pushed the refactor_docks branch 2 times, most recently from 919c8de to 2e519de Compare January 20, 2023 19:49
@WizardCM WizardCM self-assigned this Jan 22, 2023
@tytan652
Copy link
Collaborator Author

tytan652 commented Jan 26, 2023

Old docks are now added before the separator if it exist.

Edit: I just forgot to add that.

@tytan652 tytan652 force-pushed the refactor_docks branch 3 times, most recently from 6512380 to c073797 Compare February 20, 2023 11:43
@tytan652 tytan652 force-pushed the refactor_docks branch 2 times, most recently from 4e52466 to 9abfbda Compare February 27, 2023 12:05
@tytan652 tytan652 force-pushed the refactor_docks branch 2 times, most recently from 671cd52 to 5188ad3 Compare March 11, 2023 09:27
Use the QAction provided by QDockWidget with new Qt connection rather
than creating a new one for each dock.
Use the QAction provided by QDockWidget with new Qt connection rather
than creating a new one for each dock.

Separate extra browser docks from extra docks, the latter is meant for
plugin/integration docks.
Copy link
Member

@WizardCM WizardCM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested as heavily as I could, with a combination of

  • custom browser docks, service integration via Twitch, YouTube and Restream
  • docking, undocking
  • switching scene collections & profiles
  • linking & unlinking service integration

Nothing in the code stands out to me as unreadable or broken.

Looks good to merge to me.

@WizardCM WizardCM merged commit e6873d3 into obsproject:master Mar 17, 2023
@tytan652 tytan652 deleted the refactor_docks branch March 17, 2023 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Enhancement Improvement to existing functionality Seeking Testers Build artifacts on CI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants