Skip to content

Re-enable native filepicker #4155

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jan 29, 2021
Merged

Re-enable native filepicker #4155

merged 2 commits into from
Jan 29, 2021

Conversation

GeorgesStavracas
Copy link
Member

@GeorgesStavracas GeorgesStavracas commented Jan 28, 2021 •
edited
Loading

Description

Re-enable native file pickers in Linux when the browser plugin is enabled.

Motivation and Context

After the recent CEF upgrade, it seems Chromium doesn't conflict with GMainLoop anymore, so the reason to disable platform native file choosers, and the GLib mainloop integration, is gone.

How Has This Been Tested?

Build with the browser plugin, add a Browser source, and open any file using OBS Studio.

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

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.

@GeorgesStavracas
UI: Reinstate native dialogs on Linux with browser enabled
19cda23 
After the recent CEF update, the GMainLoop-in-a-thread conflict seems to be
gone, which allows us to being back native dialogs.
@GeorgesStavracas
UI: Don't define QT_NO_GLIB
6fa63e3 
The same reasoning of the previous patch means we can also stop
force-disabling Qt/GLib integration.
@GeorgesStavracas GeorgesStavracas changed the title Feaneron/reenable native filepicker Re-enable native filepicker Jan 28, 2021
@WizardCM WizardCM added Code Cleanup Non-breaking change which makes code smaller or more readable Seeking Testers Build artifacts on CI Linux Affects Linux labels Jan 28, 2021
@jp9000
Copy link
Member

jp9000 commented Jan 29, 2021

prays that nothing bad happens

@jp9000 jp9000 merged commit f12dbc8 into obsproject:master Jan 29, 2021
@GeorgesStavracas GeorgesStavracas deleted the feaneron/reenable-native-filepicker branch February 4, 2021 18:07
@RytoEX RytoEX mentioned this pull request Mar 17, 2021
Merged
6 tasks
@RytoEX RytoEX added this to the OBS Studio 27.0 milestone Mar 20, 2021
@RytoEX RytoEX mentioned this pull request May 16, 2021
Closed
@WizardCM WizardCM mentioned this pull request Aug 21, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Code Cleanup Non-breaking change which makes code smaller or more readable Linux Affects Linux Seeking Testers Build artifacts on CI
Projects
None yet
Milestone
OBS Studio 27.0
Development

Successfully merging this pull request may close these issues.
4 participants
@GeorgesStavracas @jp9000 @RytoEX @WizardCM